5622f37 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-ansi2html

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