Merge branch 'ff/vserver' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 28 Feb 2007 15:14:34 +0000 (16:14 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 28 Feb 2007 15:14:34 +0000 (16:14 +0100)
commit84e361e1a1db996254ed27ecb888c45489abc297
tree135280195142e7631452c652c21f45d4bb59b674
parentb41e61688c372024abeab0882252b25ff68624d6
parentb5036c00467038f0e486989235cdb1aaf09a642d
Merge branch 'ff/vserver' into collectd-4