[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e9ca5d 8fc0970)
Merge pull request #4 from collectd/master
authorbbczeuz <githubmail@zeuz.ch>
Sun, 13 Sep 2015 22:10:44 +0000 (00:10 +0200)
committerbbczeuz <githubmail@zeuz.ch>
Sun, 13 Sep 2015 22:10:44 +0000 (00:10 +0200)
sync with upstream


Trivial merge
statistics collection and monitoring daemon (clone)