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

author Silvio Rhatto <rhatto@riseup.net>

Thu, 27 Aug 2009 22:38:39 +0000 (19:38 -0300)

committer Silvio Rhatto <rhatto@riseup.net>

Thu, 27 Aug 2009 22:38:39 +0000 (19:38 -0300)
author Silvio Rhatto <rhatto@riseup.net>
Thu, 27 Aug 2009 22:38:39 +0000 (19:38 -0300)
committer Silvio Rhatto <rhatto@riseup.net>
Thu, 27 Aug 2009 22:38:39 +0000 (19:38 -0300)
diff --cc manifests/client.pp
Simple merge
diff --cc manifests/dup.pp
Simple merge
author	Silvio Rhatto <rhatto@riseup.net>
	Thu, 27 Aug 2009 22:38:39 +0000 (19:38 -0300)
committer	Silvio Rhatto <rhatto@riseup.net>
	Thu, 27 Aug 2009 22:38:39 +0000 (19:38 -0300)
		1	2
manifests/client.pp	patch \|	diff1 \|	diff2 \|	blob \| history
manifests/dup.pp	patch \|	diff1 \|	diff2 \|	blob \| history