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

[Toshio くらとみ]

commit e98dae6e4e0657aa5179a060168f449be593926d
Merge: a69b50d 6f057ee
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Jul 16 11:19:15 2012 -0700

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

 python-paver.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc python-paver.spec
index 19757be,dc33e3a..2eb79ff
--- a/python-paver.spec
+++ b/python-paver.spec
@@@ -82,9 -87,12 +82,15 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Mon Jul 16 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.5-1
 +- Update to 1.0.5
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Jan 18 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.4-1
  - Update to 1.0.4