From: root <root@build.drsnuggles.stderr.nl>
Date: Tue, 3 Aug 2010 15:49:33 +0000 (+0200)
Subject: Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles... 
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fbuild;p=matthijs%2Fservers%2Fdrsnuggles.git

Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles into build

* 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles:
  oidentd: Allow the vserver host to forward connections.
  oidentd: Add default configuration.
---

ffe56f880f3acea6d30d1bfd6d60d01cdb238161