2f5bcb Merge branch 'master' into f17

Merged and Committed by Simone Caronni 11 years ago
1 file changed. 34 lines added. 32 lines removed.
    Merge branch 'master' into f17
    
    Conflicts:
    	bacula.spec
    
        
file modified
+34 -32