[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1b0aa5 9c8f311)
Merge pull request #6 from collectd/master
authorClaudius Zingerli <githubmail@zeuz.ch>
Wed, 20 Jan 2016 15:15:34 +0000 (16:15 +0100)
committerClaudius Zingerli <githubmail@zeuz.ch>
Wed, 20 Jan 2016 15:15:34 +0000 (16:15 +0100)
merging from upstream


Trivial merge
statistics collection and monitoring daemon (clone)