projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 0fd27c3 8affd94)
Merge remote-tracking branch 'github/pr/2492'
authorFlorian Forster <octo@collectd.org>
Mon, 23 Oct 2017 13:20:40 +0000 (15:20 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 23 Oct 2017 13:20:40 +0000 (15:20 +0200)

Trivial merge
collectd, the system statistics collection daemon