ee16f83 Merge branch 'master' into f19

Merged and Committed by phracek 10 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'master' into f19
    
    Conflicts:
    	amanda.spec
    
        
file modified
+5 -2