Empty merge
authorRich Salz <rsalz@openssl.org>
Mon, 8 Sep 2014 14:44:04 +0000 (10:44 -0400)
committerRich Salz <rsalz@openssl.org>
Mon, 8 Sep 2014 14:45:53 +0000 (10:45 -0400)
commitc387f7d0ea09afa7101d4c1819f9b47904bad478
tree872924c229e5fd8d731ce7746fdd2c5e82028541
parentdd3c21b2d2a5183c5a2f212bdd8377faeab48f3f
parentdd13aadf9e762794686023f2c06e8eb2bf4a8dc7
Empty merge

Merge branch 'OpenSSL_1_0_2-stable' of git.openssl.org:openssl into OpenSSL_1_0_2-stable

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