750b62f Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-chameleon

Merged and Committed by toshio 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-chameleon
    
    Conflicts:
    	python-chameleon.spec
    
        
file modified
+4 -0