projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 413c4da 2b65d24)
Merge commit 'origin/ff/routeros'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 11:14:02 +0000 (12:14 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 11:14:02 +0000 (12:14 +0100)

Trivial merge
collectd, the system statistics collection daemon