projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ba42e0 06adec2)
Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 16 Apr 2007 12:53:12 +0000 (14:53 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 16 Apr 2007 12:53:12 +0000 (14:53 +0200)

Trivial merge
collectd, the system statistics collection daemon