[libyaml/el6: 9/9] Merge branch 'master' into el6

[John Eckersberg]

commit a83c5a3418a4fb382406ffc631d0915868d23365
Merge: 6a11bc0 93fb539
Author: John Eckersberg <jeckersb at redhat.com>
Date:   Tue Feb 11 10:54:11 2014 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	libyaml.spec

 .gitignore   |    2 ++
 libyaml.spec |   21 +++++++++------------
 sources      |    2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)
---
diff --cc libyaml.spec
index 40a84ee,a11ef7a..41d8281
--- a/libyaml.spec
+++ b/libyaml.spec
@@@ -81,9 -73,29 +73,14 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Tue Feb  4 2014 John Eckersberg <jeckersb at redhat.com> - 0.1.5-1
+ - New upstream release 0.1.5 (bz1061087)
+ - Removed patches for CVE-2013-6393; they are included in 0.1.5
+   upstream
+ 
 -* Wed Jan 29 2014 John Eckersberg <jeckersb at redhat.com> - 0.1.4-6
 +* Wed Jan 29 2014 John Eckersberg <jeckersb at redhat.com> - 0.1.3-4
  - Add patches for CVE-2013-6393 (bz1033990)
  
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Thu Jun 23 2011 John Eckersberg <jeckersb at redhat.com> - 0.1.4-1
 -- New upstream release 0.1.4
 -
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild