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

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

ef4a3db895a0aba7107c0f1c6c2ef2a7f128aaf8