diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-10 18:32:12 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-10 18:32:12 +0100 |
| commit | 07c02213dbd453523a07857a6dc15a25fc4b5bde (patch) | |
| tree | 7dfd11fc181f93399037a15a7900dda30fd1d7ef /templates/master.cf.debian-squeeze.erb | |
| parent | b8fc529f06ce01b38142ab920388a921701c3c73 (diff) | |
| parent | 96b41a3e47819846cc8bb0b626f4f8b705b77890 (diff) | |
Merge remote branch 'nadir/master'
Conflicts:
manifests/classes/postfix.pp
Diffstat (limited to 'templates/master.cf.debian-squeeze.erb')
0 files changed, 0 insertions, 0 deletions