projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f150642 3ae8778)
Merge branch 'collectd-4.9'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:54:52 +0000 (11:54 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:54:52 +0000 (11:54 +0100)

Trivial merge
collectd, the system statistics collection daemon