diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-01 11:54:54 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-01 11:54:54 -0200 |
| commit | 2e95f11a809a541c0ed852c7b2057dc53f49818d (patch) | |
| tree | cee76bfcf81aac6649811408d92f19c0ad75f285 /manifests/init.pp | |
| parent | 6ed1f8dfe6b16f148dde641482709958bc393815 (diff) | |
| parent | 292dd6b41adde8ca018e7c9b0d976420dc8905bc (diff) | |
| download | puppet-backupninja-2e95f11a809a541c0ed852c7b2057dc53f49818d.tar.gz puppet-backupninja-2e95f11a809a541c0ed852c7b2057dc53f49818d.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/module_backupninja
Conflicts:
manifests/rdiff.pp
Diffstat (limited to 'manifests/init.pp')
0 files changed, 0 insertions, 0 deletions