90d0872 Merge branch 'master' into f18

Merged and Committed by hannes 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	quodlibet-2.5-masked-library.patch
    
    Update to 2.5.1
    
        
file modified
+2 -0
file modified
+25 -6
file modified
+2 -2