[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e7c4f2 82f22e2)
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Wed, 28 Nov 2012 07:17:39 +0000 (08:17 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Nov 2012 07:17:39 +0000 (08:17 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)