Code

Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 19:17:02 +0000 (21:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 19:17:02 +0000 (21:17 +0200)
commit0d80072344ea5322c34f716ed77a5319a62bfc96
tree0a9fc7871da4d780b4c1630969503e9cd41dedd6
parent21058a13ed34ade6d2de0f54e4216b255d033af1
parenta96ba1d6c979b4bccbc4d2ebc8872c5dbb1d1e09
Merge branch 'collectd-5.5'