projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45492ba e118517)
Merge remote-tracking branch 'github/pr/2466' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Fri, 6 Oct 2017 05:26:57 +0000 (07:26 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 6 Oct 2017 05:26:57 +0000 (07:26 +0200)

Trivial merge
collectd, the system statistics collection daemon