From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Apr 2015 07:17:27 +0000 (+0200)
Subject: Merge branch 'collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.5.0~12^2~6^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=82e27678f8972d2625b466e7e7ba9daaa6395c98;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.3
---

82e27678f8972d2625b466e7e7ba9daaa6395c98