projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b54b5eb c4d0136)
Merge branches 'sh/email' and 'ls/processes'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Dec 2006 07:05:27 +0000 (08:05 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Dec 2006 07:05:27 +0000 (08:05 +0100)

Trivial merge
collectd, the system statistics collection daemon