Code

Merge commit 'refs/pull/1360/head' of github.com:collectd/collectd
authorFlorian Forster <octo@collectd.org>
Fri, 27 Nov 2015 06:42:25 +0000 (07:42 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 27 Nov 2015 06:42:25 +0000 (07:42 +0100)

Trivial merge