149a2ab Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-flask into el6

Merged and Committed by Ricky Elrod 11 years ago
1 file changed. 4 lines added. 0 lines removed.
    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-flask into el6
    
    Conflicts:
    	.gitignore
    	python-flask.spec
    	sources
    
        
file modified
+4 -0