projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8982229 8160b21)
Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 31 Jul 2007 07:29:46 +0000 (09:29 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 31 Jul 2007 07:29:46 +0000 (09:29 +0200)

Trivial merge
collectd, the system statistics collection daemon