Merge commit 'origin/template' into mail
authorroot <root@drsnuggles.stderr.nl>
Tue, 5 May 2009 16:20:22 +0000 (18:20 +0200)
committerroot <root@drsnuggles.stderr.nl>
Tue, 5 May 2009 16:20:22 +0000 (18:20 +0200)
commitd6c199de94861a9149558b44a34dd902d7f1e55c
treef7dab0a1f76b91ce91135b1363a8e4c5e43ac4d0
parent59415dbc6f1035e08473fc7f4887e38d3ef34f07
parent3efd2f3ff6b490e947d45ec28925f35888ec6896
Merge commit 'origin/template' into mail

* commit 'origin/template':
  rsyslog: Use another format for forwarding messages.
  ssh: Disable changing of the oom_adj value.
  ssh: Add default initscript configuration.