Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 15 Jan 2016 16:19:41 +0000 (17:19 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 15 Jan 2016 16:19:41 +0000 (17:19 +0100)
commit9c8f3110063cf83fa146929d5f28f8ecf17a4ffd
treedda9d07bbb515e063a6fe565b05588d495d55745
parentca4a6c8a856a9012270ec10389b08d54e70e3401
parent778a6720a300cf549f5bcca9c22a3ef09d97f16f
Merge branch 'collectd-5.5'