From: Rich Salz <rsalz@akamai.com>
Date: Tue, 26 Aug 2014 17:54:21 +0000 (-0400)
Subject: Merge branch 'master' of git.openssl.org:openssl
X-Git-Tag: master-pre-reformat~405
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed49eb4a48a11978d6ba8508fe9bae6794a20372;p=openssl

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

Stupid git tricks :(

Reviewed-by: rsalz
---

ed49eb4a48a11978d6ba8508fe9bae6794a20372