3ea9271 Merge branch 'master' into f19

Merged and Committed by Martin Milata 10 years ago
1 file changed. 7 lines added. 10 lines removed.
    Merge branch 'master' into f19
    
    Conflicts:
    	satyr.spec
    
        
file modified
+7 -10