Merge branch 'OpenSSL_1_0_2-stable' of git.openssl.org:openssl into OpenSSL_1_0_2...
authorRich Salz <rsalz@openssl.org>
Mon, 8 Sep 2014 14:46:38 +0000 (10:46 -0400)
committerRich Salz <rsalz@openssl.org>
Mon, 8 Sep 2014 14:47:03 +0000 (10:47 -0400)
commit1915744a64a0e9e2325deab592b0002cc4965d67
tree872924c229e5fd8d731ce7746fdd2c5e82028541
parentc387f7d0ea09afa7101d4c1819f9b47904bad478
parenteee95fc64f1791554fba495ae6d24e4b9df7670b
Merge branch 'OpenSSL_1_0_2-stable' of git.openssl.org:openssl into OpenSSL_1_0_2-stable

another empty merge???

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>