6188da5 Merge branch 'master' into f20

Merged and Committed by Stanislav Ochotnicky 10 years ago
1 file changed. 4 lines added. 4 lines removed.
    Merge branch 'master' into f20
    
    Conflicts:
    	xmvn.spec
    
        
file modified
+4 -4