From: Antoine Beaupre <anarcat@koumbit.org>
Date: Mon, 8 Dec 2008 21:24:43 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d61e1c60fabc102103b0fa79450ed6a5ca0da0ca;p=puppet-backupninja.git

Merge commit 'micah/master'

Conflicts:

	templates/rdiff.conf.erb
---

d61e1c60fabc102103b0fa79450ed6a5ca0da0ca