Code

Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 07:33:10 +0000 (09:33 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 07:33:10 +0000 (09:33 +0200)
commit915fb28ee1a2fb80f1f0b73f2869bcf981c932c2
tree7fee6e639e6351b0d8165c7292457d09a694f3b6
parent357cae102b2994f1874f5691dc571543111bd5fa
parentfd06911c23375dc40beeef0406ddf98cec7d3fcf
Merge branch 'collectd-5.6'