projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eba226f 40d2559)
Merge branch 'collectd-3.9'
authorFlorian Forster <octo@huhu.verplant.org>
Sun, 9 Jul 2006 08:16:49 +0000 (10:16 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sun, 9 Jul 2006 08:16:49 +0000 (10:16 +0200)

Trivial merge
collectd, the system statistics collection daemon