commit 1f13e727aa7eef5bfdf965cc55f4e4ac24a9d34f
Merge: 6a2d14b 66305fd
Author: root <root(a)puppet.ovh.rpmfusion.lan>
Date: Mon Jul 8 15:18:01 2013 +0200
Merge branch 'master' of
ssh://git.rpmfusion.org/git/infrastructure/puppet
files/dns/rpmfusion.org | 3 +--
.../files/config/fedora-19-i386-rpmfusion_free.cfg | 6 +++---
.../config/fedora-19-i386-rpmfusion_nonfree.cfg | 10 +++++-----
.../config/fedora-19-x86_64-rpmfusion_free.cfg | 6 +++---
.../config/fedora-19-x86_64-rpmfusion_nonfree.cfg | 6 +++---
5 files changed, 15 insertions(+), 16 deletions(-)
---