projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c42c7b ff4ebc0)
Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:30:43 +0000 (18:30 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:30:43 +0000 (18:30 +0100)

Trivial merge
collectd, the system statistics collection daemon