Merge commit 'origin/template' into ldap
authorroot <root@drsnuggles.stderr.nl>
Tue, 5 May 2009 16:20:21 +0000 (18:20 +0200)
committerroot <root@drsnuggles.stderr.nl>
Tue, 5 May 2009 16:20:21 +0000 (18:20 +0200)
commit8a3a1424b98cd386937578a5564a82e4a4de26fc
tree853e778007ea3128a8d59329fdbf771508bcd049
parent1986cdeccd75c56fd2a4833461f18be634f6b039
parent3efd2f3ff6b490e947d45ec28925f35888ec6896
Merge commit 'origin/template' into ldap

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