From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 23 Jan 2014 13:18:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.4.1~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7a762196fa7a4024c19ceac9b0c6918a5d8f62d5;p=collectd.git

Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.3
---

7a762196fa7a4024c19ceac9b0c6918a5d8f62d5