commit c7343c3be3582950426c82d3e4dc84a1b30e4bad Merge: 9ed7708 d6f9db0 Author: root <root(a)puppet.ovh.rpmfusion.lan&gt; Date: Thu Jul 11 14:35:46 2013 +0200 Merge branch 'master' of ssh://git.rpmfusion.org/git/infrastructure/puppet files/dns/rpmfusion.org | 3 +-- manifests/nodes.pp | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---