From: Ben Laurie <ben@links.org>
Date: Fri, 4 Oct 2013 13:43:43 +0000 (+0100)
Subject: Merge branch 'rob-100' into OpenSSL_1_0_0-stable
X-Git-Tag: OpenSSL_1_0_0l~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7aa71a3f90af474c7ba40ef5858345acf7b010b;p=openssl

Merge branch 'rob-100' into OpenSSL_1_0_0-stable
---

b7aa71a3f90af474c7ba40ef5858345acf7b010b