From: Rich Salz <rsalz@akamai.com>
Date: Tue, 12 Aug 2014 19:33:36 +0000 (-0400)
Subject: Merge branch 'master' of git.openssl.org:openssl
X-Git-Tag: master-pre-reformat~469
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c5be3d7f0bd64479fe0473fc36e16418537b232;p=thirdparty%2Fopenssl.git

Merge branch 'master' of git.openssl.org:openssl
---

1c5be3d7f0bd64479fe0473fc36e16418537b232