[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eda7887 a8c7622)
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Fri, 30 Nov 2012 06:22:11 +0000 (07:22 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 30 Nov 2012 06:22:11 +0000 (07:22 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)