Code

Merge remote-tracking branch 'github/pr/2040'
authorFlorian Forster <octo@collectd.org>
Mon, 21 Nov 2016 07:33:42 +0000 (08:33 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 21 Nov 2016 07:33:42 +0000 (08:33 +0100)

Trivial merge