807e3da Merge branch 'master' of ssh://pkgs.fedoraproject.org/audacious-plugins

Merged and Committed by mschwendt 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/audacious-plugins
    
    Conflicts:
    	audacious-plugins.spec
    
        
file modified
+5 -2