[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 670dd12 dfb341b)
Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
authorFlorian Forster <octo@collectd.org>
Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)

Trivial merge
statistics collection and monitoring daemon (clone)