Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 07:34:07 +0000 (08:34 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 07:34:07 +0000 (08:34 +0100)
commit7531a36086295c02ccb2d78c41d355a424426607
tree25584f4d9b53810c7217c58aa0a91346b7e16b42
parente6f4cbc03804c52e28ccf5f0cad1d5b47537ce19
parent6d13532642c934667697842e4ff021e070ddf34d
Merge branch 'collectd-5.5'