ba2a42e Merge branch 'master' into f12

Merged and Committed by ausil 13 years ago
    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	koji.spec
    	sources
    
        
file modified
+2 -0
file modified
+53 -4
file modified
+1 -1