0f78d82 Merge branch 'master' into private-kdudka-python3

Merged and Committed by kdudka 10 years ago
    Merge branch 'master' into private-kdudka-python3
    
    Conflicts:
    	python-pycurl.spec
    
        
file modified
+1 -0
file modified
+9 -9
file modified
+1 -1