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)
commit506a3d1f9cffeeba71c6f00bfe6701549bf24ff8
tree5d6ba7cec67989d14e4e11e600617dd928c1be52
parent17e80c6bd05de7406a65116f34ed59665607d8d5
parentf34a57202be4a5d3786ba65ad88d760aa02630f0
Merge branch 'master' of git.openssl.org:openssl

Gah, I hate when I forget to pull before merging.

Reviewed-by: rsalz