312ea8 Merge branch 'master' into f21

Merged and Committed by Lukas Nykryn 10 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	chkconfig.spec
    
        
file modified
+1 -0
file modified
+6 -7
file modified
+1 -1