From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 8 Apr 2015 22:53:49 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.5.0~12^2~8
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=079f487bae003575e360dcd6034546485f69b5c8;p=collectd.git

Merge branch 'collectd-5.3' into collectd-5.4
---

079f487bae003575e360dcd6034546485f69b5c8