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)
commit6924686b783d0c4f1e27df74e0165be0c65f3c8f
tree92f73f12a2e0434af98ededbc8c124800657fa19
parent92745f8116a45aaf15018dad49cf663ea76fa56a
parent5cfefd3ce33a90e89c24e8860ecbc2c6ef113fe7
Merge branch 'OpenSSL_1_0_2-stable' of openssl.net:openssl into OpenSSL_1_0_2-stable