Code

Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 00:08:16 +0000 (01:08 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 00:08:16 +0000 (01:08 +0100)
commit28fa063b625c772f45c99b618f498715fb98474b
tree30e7025d966ff530f0f5d1a0693bbb05bcecf21f
parenta6ba92ef280e69e5498ee88723ed009dd2a0444d
parentd3f8bb573b981294a614a25fc425f8cf97390275
Merge branch 'collectd-5.5'