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

[Fabian Affolter]

commit 7ab702fb975e1ad85e8873ae762e5509c5bf7479
Merge: 869aa40 da762e8
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Jan 27 22:17:47 2012 +0100

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

 python-dulwich.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc python-dulwich.spec
index c0ef529,077414b..0086427
--- a/python-dulwich.spec
+++ b/python-dulwich.spec
@@@ -76,9 -76,9 +76,12 @@@ nosetests test_web.p
  
  
  %changelog
- * Fri Dec 23 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.8.2-1
++* Fri Jan 27 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.8.2-1
 +- Updated to new upstream version 0.8.2
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Oct 13 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.8.0-1
  - Updated to new upstream version 0.8.0