]> gitweb.fluxo.info Git - puppet-backupninja.git/commitdiff
projects / puppet-backupninja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f51344a 72493d7)
Merge commit 'micah/master'
authorAntoine Beaupre <anarcat@koumbit.org>
Mon, 8 Dec 2008 21:24:43 +0000 (16:24 -0500)
committerAntoine Beaupre <anarcat@koumbit.org>
Mon, 8 Dec 2008 21:24:43 +0000 (16:24 -0500)
Conflicts:

templates/rdiff.conf.erb


Trivial merge
Puppet module for backupninja