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

[Fabian Affolter]

commit 4c20ac8b3c01d776da91ccc9104bf63c0c351c1b
Merge: 2346c33 8b2c02f
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Tue Mar 13 22:46:57 2012 +0100

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

 python-distutils-extra.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-distutils-extra.spec
index dc7f5f9,5871d95..e8ed417
--- a/python-distutils-extra.spec
+++ b/python-distutils-extra.spec
@@@ -43,9 -43,9 +43,12 @@@ chmod a+x %{buildroot}%{python_sitelib}
  
  
  %changelog
 +* Tue Mar 13 2012 Fabian Affolter <mail at fabian-affolter.ch> - 2.32-1
 +- Updated to new upstream version 2.32
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.31-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Nov 13 2011 Fabian Affolter <mail at fabian-affolter.ch> - 2.31-1
  - Updated to new upstream version 2.31