Merge branch 'OpenSSL_1_0_2-stable' of /usr/local/google/home/bmoeller/openssl/openss...
authorBodo Moeller <bodo@openssl.org>
Mon, 16 Sep 2013 12:51:10 +0000 (14:51 +0200)
committerBodo Moeller <bodo@openssl.org>
Mon, 16 Sep 2013 12:51:10 +0000 (14:51 +0200)

Trivial merge