projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d6ab00 e7929da)
Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Aug 2008 07:20:56 +0000 (09:20 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Aug 2008 07:20:56 +0000 (09:20 +0200)

Trivial merge
collectd, the system statistics collection daemon