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

[Fabian Affolter]

commit 06b6b2ccd4e6e635f746f93036b171ecb18990ca
Merge: 71a9618 6616f90
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Aug 5 21:23:33 2012 +0200

    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 95b9fdd,c717d3c..5d04a79
--- a/python-distutils-extra.spec
+++ b/python-distutils-extra.spec
@@@ -43,9 -43,9 +43,12 @@@ chmod a+x %{buildroot}%{python_sitelib}
  
  
  %changelog
 +* Sun Aug 05 2012 Fabian Affolter <mail at fabian-affolter.ch> - 2.34-1
 +- Updated to new upstream version 2.34
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.33-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Jun 16 2012 Fabian Affolter <mail at fabian-affolter.ch> - 2.33-1
  - Updated to new upstream version 2.33