[openssl/f21: 5/5] Merge branch 'master' into f21

[Tomáš Mráz]

commit ed457feb491c7470eccf8449c329361b205a20aa
Merge: 4fcc430 446f9be
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Thu Mar 19 17:18:22 2015 +0100

    Merge branch 'master' into f21

 openssl-1.0.1e-cc-reqs.patch  | 25 +++++++++++++++++++++++++
 openssl-1.0.1j-evp-wrap.patch | 16 ++++++++--------
 openssl.spec                  | 22 +++++++++++++++++++---
 3 files changed, 52 insertions(+), 11 deletions(-)
---