]> git.mjollnir.org Git - vserverctl.git/commit
Merge commit 'nigel'
authorMartyn Smith <martyn@catalyst.net.nz>
Tue, 3 Apr 2007 10:53:47 +0000 (22:53 +1200)
committerMartyn Smith <martyn@sear.home>
Tue, 3 Apr 2007 10:53:47 +0000 (22:53 +1200)
commit49dcc7c1c1b8100c8343f43192bfc99f5a8578a2
tree0f6440aad9ca902b3b547ce72c76857fc1169603
parent80aaef13b8b241b575999ffbc49d1ca5bee32f49
parentba13120610ba5a2772dd51113caf791d8fe642f5
Merge commit 'nigel'

Conflicts:

vserverctl
vserverctl