diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2009-08-27 19:38:39 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2009-08-27 19:38:39 -0300 |
commit | 149cba805ca00077bc8cd663542ee755516b032a (patch) | |
tree | 926decdefbf49fa6d3461333479ba4d26ea26853 /templates | |
parent | d162c8429284b2dd18f90c23095935b35cc0106c (diff) | |
parent | d890916504b8fe282392f0a1cddc58f12a0e983b (diff) | |
download | puppet-backupninja-149cba805ca00077bc8cd663542ee755516b032a.tar.gz puppet-backupninja-149cba805ca00077bc8cd663542ee755516b032a.tar.bz2 |
Merge branch 'master' of git://labs.riseup.net/module_backupninja
Conflicts:
manifests/dup.pp
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions