Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles...
authorroot <root@log.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:49:35 +0000 (17:49 +0200)
committerroot <root@log.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:49:35 +0000 (17:49 +0200)
* 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles:
  oidentd: Allow the vserver host to forward connections.
  oidentd: Add default configuration.


Trivial merge