projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d785e79 6bed4b1)
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Jan 2010 09:32:01 +0000 (10:32 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Jan 2010 09:32:01 +0000 (10:32 +0100)

Trivial merge
collectd, the system statistics collection daemon