projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15cc454 e428176)
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200)

Trivial merge
collectd, the system statistics collection daemon