]> git.mjollnir.org Git - vserverctl.git/commitdiff
Merge branch 'master' of http://scorch.dollyfish.net.nz/~nigel/git/vserverctl
authorMartyn Smith <martyn@catalyst.net.nz>
Thu, 12 Apr 2007 03:24:54 +0000 (15:24 +1200)
committerMartyn Smith <martyn@sear.home>
Thu, 12 Apr 2007 03:24:54 +0000 (15:24 +1200)
1  2 
vserverctl

diff --cc vserverctl
Simple merge