[python-distutils-extra/f15: 8/8] Merge branch 'master' into f15

[Fabian Affolter]

commit 1d32587e6bfee142dc75427e7d31caf10ad3de61
Merge: 06cf97f 4c20ac8
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Tue Mar 13 23:26:42 2012 +0100

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	python-distutils-extra.spec
    	sources

 .gitignore                  |    6 ++++++
 python-distutils-extra.spec |   16 ++++++++++++++--
 sources                     |    4 ++++
 3 files changed, 24 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 84a6009,feed1c5..1a57c17
--- a/.gitignore
+++ b/.gitignore
@@@ -2,4 -2,6 +2,10 @@@ dist-python-distutils-extra-2.19.tar.g
  /python-distutils-extra-2.22.tar.gz
  /python-distutils-extra-2.26.tar.gz
  /python-distutils-extra-2.27.tar.gz
++<<<<<<< HEAD
 +/python-distutils-extra-2.28.tar.gz
++=======
+ /python-distutils-extra-2.29.tar.gz
+ /python-distutils-extra-2.31.tar.gz
+ /python-distutils-extra-2.32.tar.gz
++>>>>>>> master
diff --cc python-distutils-extra.spec
index bfb35ae,e8ed417..d68e13e
--- a/python-distutils-extra.spec
+++ b/python-distutils-extra.spec
@@@ -43,9 -43,18 +43,21 @@@ 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
+ 
+ * Wed Aug 31 2011 Fabian Affolter <fabian at bernewireless.net> - 2.29-1
+ - Updated to new upstream version 2.29
+ 
 +* Sun Jun 19 2011 Fabian Affolter <fabian at bernewireless.net> - 2.28-1
 +- Updated to new upstream version 2.28
 +
  * Thu Jun 02 2011 Fabian Affolter <fabian at bernewireless.net> - 2.27-1
  - Updated to new upstream version 2.27
  
diff --cc sources
index 56fb586,6ee1e58..8df0de3
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +6f4bd56233161fe8ce29a1b344f99da6  python-distutils-extra-2.28.tar.gz
++=======
+ 034b6594d10084bb49d99c1511b30187  python-distutils-extra-2.32.tar.gz
++>>>>>>> master