]> granicus.if.org Git - openssl/commitdiff
Merge branch 'OpenSSL_1_0_2-stable' of openssl.net:openssl into OpenSSL_1_0_2-stable
authorBodo Moeller <bodo@openssl.org>
Tue, 17 Sep 2013 07:59:14 +0000 (09:59 +0200)
committerBodo Moeller <bodo@openssl.org>
Tue, 17 Sep 2013 07:59:14 +0000 (09:59 +0200)
1  2 
CHANGES

diff --cc CHANGES
Simple merge