Merge branch 'master' into f13

Conflicts:
	PyYAML.spec
This commit is contained in:
John Eckersberg 2011-02-02 10:03:23 -05:00
commit 839abc267a

View File

@ -4,7 +4,7 @@
Name: PyYAML
Version: 3.09
Release: 5%{?dist}
Release: 6%{?dist}
Summary: YAML parser and emitter for Python
Group: Development/Libraries
@ -53,8 +53,11 @@ rm -rf %{buildroot}
%changelog
* Mon Nov 30 2009 John Eckersberg <jeckersb@redhat.com> - 3.09-5
- Rebuild with libyaml-0.1.3
* Tue Jul 27 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 3.09-6
- Bump release number for upgrade path
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.09-3
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Fri Oct 02 2009 John Eckersberg <jeckersb@redhat.com> - 3.09-1
- New upstream release 3.09