projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f690ec6 15af3d5)
Merge remote-tracking branch 'github/pr/2442'
authorFlorian Forster <octo@collectd.org>
Mon, 25 Sep 2017 07:36:23 +0000 (09:36 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 25 Sep 2017 07:36:23 +0000 (09:36 +0200)

Trivial merge
collectd, the system statistics collection daemon