From: Nigel McNie <nigel@catalyst.net.nz>
Date: Tue, 3 Apr 2007 10:55:15 +0000 (+1200)
Subject: Merge branch 'master' of http://dollyfish.net.nz/~martyn/git/vserverctl
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e5ba36cb745712c2c25f6959b561de01c31993fd;p=vserverctl.git

Merge branch 'master' of http://dollyfish.net.nz/~martyn/git/vserverctl
---

e5ba36cb745712c2c25f6959b561de01c31993fd