c70a197 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-httplib2

Merged and Committed by dchen 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-httplib2
    
    Conflicts:
    	python-httplib2.spec
    
        
file modified
+5 -2