projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6584e8 b49cb08)
Merge remote-tracking branch 'github/pr/2440'
authorFlorian Forster <octo@collectd.org>
Mon, 25 Sep 2017 18:58:35 +0000 (20:58 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 25 Sep 2017 18:58:35 +0000 (20:58 +0200)

Trivial merge
collectd, the system statistics collection daemon