Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Tue, 26 Aug 2014 17:54:21 +0000 (13:54 -0400)
committerRich Salz <rsalz@akamai.com>
Tue, 26 Aug 2014 17:55:13 +0000 (13:55 -0400)
Stupid git tricks :(

Reviewed-by: rsalz

Trivial merge