projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b41e616 b5036c0)
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)

Trivial merge
collectd, the system statistics collection daemon