e8e2bb6 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora

Merged and Committed by toshio 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora
    
    Conflicts:
    	python-fedora.spec
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1