projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26442d5 eba50a3)
Auto-Merge pull request #2540 from octo/cid/141009
authorcollectd bot <32910397+collectd-bot@users.noreply.github.com>
Fri, 17 Nov 2017 13:29:29 +0000 (14:29 +0100)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2017 13:29:29 +0000 (14:29 +0100)
Automatically merged due to "Automerge" label


Trivial merge
collectd, the system statistics collection daemon