From: Rich Salz <rsalz@openssl.org>
Date: Mon, 8 Sep 2014 14:46:38 +0000 (-0400)
Subject: Merge branch 'OpenSSL_1_0_2-stable' of git.openssl.org:openssl into OpenSSL_1_0_2... 
X-Git-Tag: OpenSSL_1_0_2-beta3~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1915744a64a0e9e2325deab592b0002cc4965d67;p=oweals%2Fopenssl.git

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>
---

1915744a64a0e9e2325deab592b0002cc4965d67