Merge branch 'OpenSSL_1_0_2-stable' of openssl.net:openssl into OpenSSL_1_0_2-stable
authorBen Laurie <ben@links.org>
Sat, 19 Jan 2013 18:36:44 +0000 (18:36 +0000)
committerBen Laurie <ben@links.org>
Sat, 19 Jan 2013 18:36:44 +0000 (18:36 +0000)

Trivial merge