From: Rich Salz <rsalz@akamai.com>
Date: Tue, 15 Jul 2014 04:05:43 +0000 (-0400)
Subject: Merge branch 'master' of git.openssl.org:openssl
X-Git-Tag: master-pre-reformat~534
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c0a1e2f8c5efc3dd4a8d4722465721034b55d92;p=thirdparty%2Fopenssl.git

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

6c0a1e2f8c5efc3dd4a8d4722465721034b55d92