Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles... mysql
authorroot <root@mysql.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:51:58 +0000 (17:51 +0200)
committerroot <root@mysql.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:51:58 +0000 (17:51 +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