From: Rich Salz <rsalz@openssl.org>
Date: Mon, 8 Sep 2014 14:44:04 +0000 (-0400)
Subject: Empty merge
X-Git-Tag: OpenSSL_1_0_2-beta3~50^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eee95fc64f1791554fba495ae6d24e4b9df7670b;p=oweals%2Fopenssl.git

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

eee95fc64f1791554fba495ae6d24e4b9df7670b