projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e400750 55c1bf4)
Auto-Merge pull request #2111 from octo/cid/157643
authorFlorian Forster <ff@octo.it>
Fri, 16 Dec 2016 18:39:06 +0000 (19:39 +0100)
committerGitHub <noreply@github.com>
Fri, 16 Dec 2016 18:39:06 +0000 (19:39 +0100)
Automatically merged due to "Automerge" label


Trivial merge
collectd, the system statistics collection daemon