projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23d34e7 ee2af3b)
Merge remote-tracking branch 'github/pr/2377'
authorFlorian Forster <octo@collectd.org>
Fri, 22 Sep 2017 06:55:18 +0000 (08:55 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 22 Sep 2017 06:55:18 +0000 (08:55 +0200)

Trivial merge
collectd, the system statistics collection daemon