dffd7c0 Merge branch 'master' of ssh://pkgs.fedoraproject.org/player

Merged and Committed by rmattes 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/player
    
    Conflicts:
    	player.spec
    
        
file modified
+7 -2