[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38203b1 8c103cf)
Merge remote-tracking branch 'github/pr/1065' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 16:35:13 +0000 (17:35 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 16:35:13 +0000 (17:35 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)