]> git.mjollnir.org Git - vserverctl.git/commitdiff
Merge branch 'master' of http://dollyfish.net.nz/~martyn/git/vserverctl
authorNigel McNie <nigel@catalyst.net.nz>
Tue, 3 Apr 2007 10:55:15 +0000 (22:55 +1200)
committerNigel McNie <nigel@freud.wgtn.cat-it.co.nz>
Tue, 3 Apr 2007 10:55:15 +0000 (22:55 +1200)

Trivial merge