Merge branch 'master' of git.openssl.org:openssl-web
authorRich Salz <rsalz@akamai.com>
Wed, 19 Nov 2014 18:39:09 +0000 (13:39 -0500)
committerRich Salz <rsalz@akamai.com>
Wed, 19 Nov 2014 18:39:09 +0000 (13:39 -0500)

Trivial merge