a5ae941 Merge branch 'master' of ssh://pkgs.fedoraproject.org/qmmp

Merged and Committed by kvolny 9 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/qmmp
    
    Conflicts:
    	qmmp.spec
    
        
file modified
+3 -0