Merge commit 'origin/template' into www
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)
commit8cbae7c2c9aa2d4ed4371113e5900a9adbfa6d5e
treef49a4b911e8cfdc6999dbda92ccb5d07022dc849
parent202368ea600f1c63978b6e130adb9e47d3d752d3
parent3efd2f3ff6b490e947d45ec28925f35888ec6896
Merge commit 'origin/template' into www

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