projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c2e242 02a570b)
Merge branch 'master' into ff/subsecond
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 30 Oct 2010 12:04:12 +0000 (14:04 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 30 Oct 2010 12:04:12 +0000 (14:04 +0200)

Trivial merge
collectd, the system statistics collection daemon