Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 19:57:56 +0000 (21:57 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 19:57:56 +0000 (21:57 +0200)
commit12f249b209d7fa31e3a9d53315e47a2342463e0f
tree0a9fc7871da4d780b4c1630969503e9cd41dedd6
parent0d80072344ea5322c34f716ed77a5319a62bfc96
parent00f086d5165423665476c7ffe5c9c47b1497fb34
Merge branch 'collectd-5.5'