From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 6 Mar 2015 21:47:08 +0000 (-0500)
Subject: Merge branch 'master' of https://git-nadir.immerda.ch/puppet-backupninja
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1ef94f1f2e49e032c6c416830345fc3b4beacb01;p=puppet-backupninja.git

Merge branch 'master' of https://git-nadir.immerda.ch/puppet-backupninja

Conflicts:
	manifests/rdiff.pp
---

1ef94f1f2e49e032c6c416830345fc3b4beacb01