From: root Date: Tue, 3 Aug 2010 15:51:59 +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=537ab47a8a166b386430b61b0c259560e4008d5d;p=matthijs%2Fservers%2Fdrsnuggles.git Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles into www * 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles: oidentd: Allow the vserver host to forward connections. oidentd: Add default configuration. --- 537ab47a8a166b386430b61b0c259560e4008d5d