projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8757d92 d5272db)
Merge branch 'collectd-4.3'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 25 Feb 2008 07:30:28 +0000 (08:30 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 25 Feb 2008 07:30:28 +0000 (08:30 +0100)

Trivial merge
collectd, the system statistics collection daemon