[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5dac90 4005961)
Merge branch 'collectd-5.0' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:39 +0000 (12:49 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:39 +0000 (12:49 +0200)

Trivial merge
statistics collection and monitoring daemon (clone)