projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c005ac af2f301)
Merge pull request #8 from collectd/master
authorClaudius Zingerli <githubmail@zeuz.ch>
Fri, 29 Apr 2016 14:29:53 +0000 (16:29 +0200)
committerClaudius Zingerli <githubmail@zeuz.ch>
Fri, 29 Apr 2016 14:29:53 +0000 (16:29 +0200)
Sync with upstream


Trivial merge
collectd, the system statistics collection daemon