Silence cron
Merge branch 'master' of git://github.com/ScottWales/puppet-git into cron

Conflicts:
	manifests/mirror.pp