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

[Toshio くらとみ]

commit f233c2c5712ff8332444fdc87872e1ea78858fd7
Merge: 9da07f1 40532c7
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Jul 30 23:23:31 2012 -0700

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

 python-paver.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-paver.spec
index 2db058e,e2d51bd..5372dd8
--- a/python-paver.spec
+++ b/python-paver.spec
@@@ -88,9 -82,9 +88,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Mon Jul 30 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1.0-1
 +- New upstream update
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Mon Jul 16 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.5-1
  - Update to 1.0.5