Code

Merge remote-tracking branch 'github/pr/2469'
authorFlorian Forster <octo@collectd.org>
Fri, 6 Oct 2017 13:33:29 +0000 (15:33 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 6 Oct 2017 13:33:29 +0000 (15:33 +0200)

Trivial merge