Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 21:16:31 +0000 (22:16 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 21:16:31 +0000 (22:16 +0100)

Trivial merge