From: Rich Salz <rsalz@openssl.org>
Date: Tue, 9 Sep 2014 21:06:40 +0000 (-0400)
Subject: Merge branch 'master' of git.openssl.org:openssl
X-Git-Tag: master-post-reformat~389
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c939cca1a351711a6c8f017f216916c10c7a1559;p=oweals%2Fopenssl.git

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

Previous commit was reviewed by Geoff, not Stephen:
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
---

c939cca1a351711a6c8f017f216916c10c7a1559