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

[Tomáš Mráz]

commit be99ed71a5af9681c52f29b07bf1cbb310883e9c
Merge: ed457fe 729d2d0
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Thu Mar 19 18:28:00 2015 +0100

    Merge branch 'master' into f21

 openssl-1.0.1e-cve-2015-0286.patch |  13 +++
 openssl-1.0.1e-cve-2015-0287.patch |  46 +++++++++++
 openssl-1.0.1e-cve-2015-0288.patch |  12 +++
 openssl-1.0.1e-cve-2015-0293.patch | 102 +++++++++++++++++++++++
 openssl-1.0.1k-cve-2015-0209.patch |  27 ++++++
 openssl-1.0.1k-cve-2015-0289.patch | 163 +++++++++++++++++++++++++++++++++++++
 openssl.spec                       |  21 ++++-
 7 files changed, 383 insertions(+), 1 deletion(-)
---