e4d4c18 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-pygments

Merged and Committed by Steve Milner 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-pygments
    
    Conflicts:
    	python-pygments.spec
    
        
file modified
+3 -0