edd5d76 Merge branch 'master' into f21

Merged and Committed by peter 9 years ago
1 file changed. 6 lines added. 2 lines removed.
    Merge branch 'master' into f21
    
    Conflicts:
    	avahi.spec
    
        
file modified
+6 -2