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

Merged and Committed by toshio 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora
    
    Conflicts:
    	python-fedora.spec
    
        
file modified
+16 -7