From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 27 Oct 2015 23:03:06 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~589
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=5bf93412e903fb36943088e711031a013495ce11

Merge branch 'collectd-5.5'
---

5bf93412e903fb36943088e711031a013495ce11