[python-paver: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-paver

[Toshio くらとみ]

commit e20ec2d56b79fef64c75889a0df174c005eb06ee
Merge: ea46763 a4f41bd
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 25 16:53:08 2013 -0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-paver
    
    Conflicts:
    	python-paver.spec

 python-paver.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc python-paver.spec
index 3fbf4c5,89b0776..d19b5f1
--- a/python-paver.spec
+++ b/python-paver.spec
@@@ -93,13 -88,9 +93,16 @@@ rm -rf %{buildroot
  
  
  %changelog
- * Mon Feb 25 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.2.0-1
++Feb 25 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.2.0-1
 +- Update to upstream 1.2.0 release
 +- samefile patch merged upstream
 +- Patch to unbundle included python-six
 +- Disable cog as it's not packaged yet
 +- Remove the unittests from the binary rpm
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Thu Jan 10 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1.1-2
  - Fix paver's use of os.path.samefile