projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5c5890 b4f0540)
Merge branch 'pull/collectd-4.1' into collectd-4.1 collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Feb 2008 13:00:37 +0000 (14:00 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Feb 2008 13:00:37 +0000 (14:00 +0100)

Trivial merge
collectd, the system statistics collection daemon