projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60c8736 c999f7e)
Merge branch 'collectd-4.3'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 27 Feb 2008 07:10:08 +0000 (08:10 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 27 Feb 2008 07:10:08 +0000 (08:10 +0100)

Trivial merge
collectd, the system statistics collection daemon