projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d364840 e9e1529)
Merge branch 'uni/collectd-4.1' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:46:07 +0000 (11:46 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:46:07 +0000 (11:46 +0200)

Trivial merge
collectd, the system statistics collection daemon