[PyYAML/f21: 5/5] Merge branch 'f22' into f21

[John Eckersberg]

commit 3c0dc1e6f38f1551e1482a04079736c1cd049f35
Merge: b7ee694 c249734
Author: John Eckersberg <jeckersb at redhat.com>
Date:   Mon Mar 23 12:50:33 2015 -0400

    Merge branch 'f22' into f21

 PyYAML-CVE-2014-9130.patch | 35 +++++++++++++++++++++++++++++++++++
 PyYAML.spec                | 11 ++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)
---