Merge branch 'master' of git.openssl.org:openssl-web
authorRich Salz <rsalz@akamai.com>
Wed, 2 Jul 2014 10:51:51 +0000 (06:51 -0400)
committerRich Salz <rsalz@akamai.com>
Wed, 2 Jul 2014 10:51:51 +0000 (06:51 -0400)

Trivial merge