e856c55 Merge branch 'f22' into f23

Merged and Committed by Hans Ulrich Niedermann 8 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'f22' into f23
    
    Conflicts:
    	beep.spec
    
        
file modified
+5 -2