From: Rich Salz <rsalz@akamai.com>
Date: Thu, 28 Aug 2014 01:36:04 +0000 (-0400)
Subject: Merge branch 'master' of git.openssl.org:openssl
X-Git-Tag: master-post-reformat~454
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=506a3d1f9cffeeba71c6f00bfe6701549bf24ff8;p=oweals%2Fopenssl.git

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

Gah, I hate when I forget to pull before merging.

Reviewed-by: rsalz
---

506a3d1f9cffeeba71c6f00bfe6701549bf24ff8