Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Jul 2015 22:29:58 +0000 (00:29 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Jul 2015 22:29:58 +0000 (00:29 +0200)
commit24c2f247f6dc5c17b26d715346a380efababb08f
treeb4729aa509cd5fe06579bf82e5cc26aba25ef03c
parent780e6a76021a240e95007a04b723d827120afa95
parent18159adcefb255db5a5234a8476e703deb6cc09f
Merge branch 'collectd-5.4' into collectd-5.5