0ae9d37 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-pkgwat-api

Merged and Committed by ralph 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-pkgwat-api
    
    Conflicts:
    	python-pkgwat-api.spec
    
        
file modified
+5 -1