projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aecd05a 4488199)
Merge remote-tracking branch 'github/pr/2489'
authorFlorian Forster <octo@collectd.org>
Wed, 18 Oct 2017 09:17:48 +0000 (11:17 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 18 Oct 2017 09:17:48 +0000 (11:17 +0200)

Trivial merge
collectd, the system statistics collection daemon