Merge commit 'origin/template' into log
authorMatthijs Kooijman <matthijs@stdin.nl>
Tue, 5 May 2009 16:20:52 +0000 (18:20 +0200)
committerMatthijs Kooijman <matthijs@stdin.nl>
Tue, 5 May 2009 16:20:52 +0000 (18:20 +0200)
commitac72e741ef1db02a9fd089c3db60b579557a8186
tree30da9aeb8778bab715b53d126a92f801489f6d6f
parent1263e510f1bad7accf1db234b374cb9ce3caa5d3
parent3efd2f3ff6b490e947d45ec28925f35888ec6896
Merge commit 'origin/template' into log

* commit 'origin/template':
  ssh: Disable changing of the oom_adj value.
  ssh: Add default initscript configuration.

* commits left out:
  rsyslog: Use another format for forwarding messages.