[mock-rpmfusion-nonfree] (7 commits) ...Merge branch 'el6'