From: Rich Salz <rsalz@openssl.org>
Date: Mon, 8 Sep 2014 14:44:07 +0000 (-0400)
Subject: Merge branch 'master' of git.openssl.org:openssl
X-Git-Tag: master-post-reformat~408
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=76e8671c5a00f00abd75c9f5978c9eaee33709d3;p=oweals%2Fopenssl.git

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

empty merge; script hiccup.

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
---

76e8671c5a00f00abd75c9f5978c9eaee33709d3