b5c1ba8 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-phyghtmap

Merged and Committed by volter 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-phyghtmap
    
    Conflicts:
    	python-phyghtmap.spec
    
        
file modified
+3 -0