Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Thu, 28 Aug 2014 01:36:04 +0000 (21:36 -0400)
committerRich Salz <rsalz@akamai.com>
Thu, 28 Aug 2014 01:36:36 +0000 (21:36 -0400)
Gah, I hate when I forget to pull before merging.

Reviewed-by: rsalz

Trivial merge