b5f392a Merge branch 'master' into f14

Merged and Committed by Fabian Affolter 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	python-dulwich.spec
    	sources
    
        
file modified
+5 -0
file modified
+29 -5
file modified
+1 -1