projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09b9a5e 8be9c73)
Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 11:11:20 +0000 (12:11 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 11:11:20 +0000 (12:11 +0100)

Trivial merge
collectd, the system statistics collection daemon