Code

Merge remote-tracking branch 'github/pr/2026' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Mon, 7 Nov 2016 06:03:17 +0000 (07:03 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 7 Nov 2016 06:03:17 +0000 (07:03 +0100)

Trivial merge