From: Ben Laurie <ben@links.org>
Date: Sat, 5 Oct 2013 20:20:24 +0000 (+0100)
Subject: Merge branch 'OpenSSL_1_0_2-stable' into pre-aead
X-Git-Tag: OpenSSL_1_0_2-beta1~206
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=c8c6914aacb444caecab300769587c8f295285bc

Merge branch 'OpenSSL_1_0_2-stable' into pre-aead
---

c8c6914aacb444caecab300769587c8f295285bc