40bea16 Merge branch 'master' of ssh://pkgs.fedoraproject.org/gstreamer-plugins-fc

Merged and Committed by mschwendt 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gstreamer-plugins-fc
    
    Conflicts:
    	gstreamer-plugins-fc.spec
    
        
file modified
+8 -2