[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7499fb 571337a)
Merge remote-tracking branch 'github/pr/1087'
authorFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 12:53:11 +0000 (14:53 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 12:53:11 +0000 (14:53 +0200)

Trivial merge
statistics collection and monitoring daemon (clone)