0c6b0b4 Merge branch 'master' into f21

Merged and Committed by tmlcoch 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	.gitignore
    	librepo.spec
    	sources
    
        
file modified
+5 -0
file modified
+15 -3
file modified
+1 -1