From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 27 Aug 2009 22:38:39 +0000 (-0300)
Subject: Merge branch 'master' of git://labs.riseup.net/module_backupninja
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=149cba805ca00077bc8cd663542ee755516b032a;p=puppet-backupninja.git

Merge branch 'master' of git://labs.riseup.net/module_backupninja

Conflicts:
	manifests/dup.pp
---

149cba805ca00077bc8cd663542ee755516b032a