Merge commit 'origin/template' into login
authorroot <root@login.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:15:32 +0000 (17:15 +0200)
committerroot <root@login.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:15:32 +0000 (17:15 +0200)
commit48f94cd0e9814a2cb5f2c2dcb52dd4f5bcb7f81f
treee7175c3c2fbad744c8184b37a23196d2d823d549
parentd25f70d83bd46b7e0b58f7a87d522f74fdf28431
parenta799b50b1d46b49b57ce3212c2fcf60317e7a6f9
Merge commit 'origin/template' into login

* commit 'origin/template':
  oidentd: Allow the vserver host to forward connections.
  oidentd: Add default configuration.