projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33aeecf 75aa62d)
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 14:52:12 +0000 (15:52 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 14:52:12 +0000 (15:52 +0100)

Trivial merge
collectd, the system statistics collection daemon