projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1297a37 540075b)
Merge branch 'pull/collectd-4.3' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 17 Mar 2008 09:45:23 +0000 (10:45 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 17 Mar 2008 09:45:23 +0000 (10:45 +0100)

Trivial merge
collectd, the system statistics collection daemon