Merge branch 'master' of openssl.net:openssl-web
authorMark J. Cox <mark@awe.com>
Thu, 16 Oct 2014 11:30:28 +0000 (12:30 +0100)
committerMark J. Cox <mark@awe.com>
Thu, 16 Oct 2014 11:30:28 +0000 (12:30 +0100)

Trivial merge