projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d151e98 11a94db)
Merge remote-tracking branch 'github/pr/2452'
authorFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 14:37:16 +0000 (16:37 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 14:37:16 +0000 (16:37 +0200)

Trivial merge
collectd, the system statistics collection daemon