Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 00:12:42 +0000 (01:12 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 00:12:42 +0000 (01:12 +0100)

No differences found