projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6254a76 0b4f637)
Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:47:44 +0000 (11:47 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:47:44 +0000 (11:47 +0100)

Trivial merge
collectd, the system statistics collection daemon