97f2bf7 Merge branch 'master' into f21

Merged and Committed by greghellings 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	.gitignore
    	sources
    	xiphos.spec
    
        
file modified
+5 -0
file modified
+1 -1
file modified
+194 -42