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

[Toshio くらとみ]

commit d3f0f56972a49b603d9a8b57584453fd3d5a2f05
Merge: 088ab48 83a5a1a
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 26 14:00:36 2012 -0800

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

 python-paste-deploy.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc python-paste-deploy.spec
index 94a257f,a8703b9..63feef6
--- a/python-paste-deploy.spec
+++ b/python-paste-deploy.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:           python-paste-deploy
  Version:        1.5.0
--Release:        3%{?dist}
++Release:        4%{?dist}
  Summary:        Load, configure, and compose WSGI applications and servers
  Group:          System Environment/Libraries
  License:        MIT
@@@ -50,10 -49,9 +50,13 @@@ rm -rf %{buildroot
  
  
  %changelog
- * Thu Jan 26 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5.0-3
++* Thu Jan 26 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5.0-4
 +- Add dependency on python-setuptools since parts of paste.deploy rely on
 +  pkg_resources
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Jul 11 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5.0-2
  - Remove the test directory as it serves no purpose and pollutes the global namespace
    https://bugzilla.redhat.com/show_bug.cgi?id=720055