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)
another empty merge???

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

Trivial merge