diff options
| author | Micah Anderson <micah@riseup.net> | 2010-09-22 13:12:51 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-09-22 13:12:51 -0400 |
| commit | a3e7b031a39d2f5a3a6cb3ff71ffe47af9fe3fc6 (patch) | |
| tree | b10b0b101dd07d34fa0d17b391179f2bb87f5607 /manifests/disable.pp | |
| parent | 316e75293331d0a9927f0731784c05dd0fb16374 (diff) | |
| parent | 24d7c6aa2480a4ff5436e2b89800c0aab11cbe33 (diff) | |
Merge remote branch 'remotes/immerda/master'
Conflicts:
manifests/server/base.pp
Diffstat (limited to 'manifests/disable.pp')
0 files changed, 0 insertions, 0 deletions