diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-13 00:25:42 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-13 00:25:42 -0200 |
| commit | a933f2c5ef5f77b081f1e11b1057c7bdc1b34fc8 (patch) | |
| tree | f53701b1f1e3b198153e6c13fcede656e9540dc4 /files | |
| parent | 4e494cf0eff237ad8638c20d8438ee83d1a0bab8 (diff) | |
| parent | 39525031704db81bfd0cd3732d7437643236ddf8 (diff) | |
| download | puppet-backup-a933f2c5ef5f77b081f1e11b1057c7bdc1b34fc8.tar.gz puppet-backup-a933f2c5ef5f77b081f1e11b1057c7bdc1b34fc8.tar.bz2 | |
Merge branch 'master' of ssh://gitosis@git.sarava.org:2203/puppet-backup
Conflicts:
manifests/init.pp
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions