Jerome Charaoui 85514f6feb Merge branch 'master' into merge_immerda_new ... Conflicts: manifests/server/cron/backup.pp		2015-04-21 09:44:01 -04:00
..
backup.pp	Merge branch 'master' into merge_immerda_new	2015-04-21 09:44:01 -04:00
optimize.pp	Cron jobs are not removed when unused.	2015-03-27 15:37:25 -04:00