projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd89cd4 649197d)
Merge branch 'master' into ff/routeros
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 11:48:34 +0000 (12:48 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 11:48:34 +0000 (12:48 +0100)

Trivial merge
collectd, the system statistics collection daemon