projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1b5ab5 e8c2ddd)
Auto-Merge pull request #2053 from nuclearcat/master
authorFlorian Forster <ff@octo.it>
Sat, 17 Dec 2016 10:39:08 +0000 (11:39 +0100)
committerGitHub <noreply@github.com>
Sat, 17 Dec 2016 10:39:08 +0000 (11:39 +0100)
Automatically merged due to "Automerge" label


Trivial merge
collectd, the system statistics collection daemon