[python-dulwich/el6: 3/3] Merge branch 'master' into el6

[Fabian Affolter]

commit 506cbfb09a44738adf19e771722f1b3c978d043e
Merge: 7b97658 1ab64ad
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Tue Apr 10 19:47:03 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	python-dulwich.spec

 .gitignore          |    2 ++
 python-dulwich.spec |    8 +++++++-
 sources             |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --cc python-dulwich.spec
index 7cc21d8,d15d6be..816a880
--- a/python-dulwich.spec
+++ b/python-dulwich.spec
@@@ -61,9 -61,12 +61,15 @@@ nosetests test*.p
  
  
  %changelog
+ * Fri Apr 06 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.8.4-1
+ - Updated to new upstream version 0.8.4
+ 
+ * Fri Feb 24 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.8.3-1
+ - Updated to new upstream version 0.8.3
+ 
 +* Sat Jan 28 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.8.2-2
 +- Added missing BR
 +
  * Fri Jan 27 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.8.2-1
  - Updated to new upstream version 0.8.2