Code

Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Tue, 16 Aug 2016 05:30:59 +0000 (07:30 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 Aug 2016 05:30:59 +0000 (07:30 +0200)

Trivial merge