Code

Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 19:17:02 +0000 (21:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 19:17:02 +0000 (21:17 +0200)

Trivial merge