Merge branch 'OpenSSL_1_0_2-stable' of /home/steve/src/git/openssl into OpenSSL_1_0_2...
authorDr. Stephen Henson <steve@openssl.org>
Mon, 4 Feb 2013 15:14:11 +0000 (15:14 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 4 Feb 2013 15:14:11 +0000 (15:14 +0000)

Trivial merge