3fcee4b Merge branch 'f14' into f13

Merged and Committed by Luke Macken 13 years ago
    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore
    	bodhi.spec
    	sources
    
        
file modified
+4 -0
file modified
+38 -6
file modified
+1 -1