From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 14 Oct 2015 06:47:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1264'
X-Git-Tag: collectd-5.6.0~591
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=dadf85ade12c75675cd20932e26d723d17a718f1;p=collectd.git

Merge remote-tracking branch 'origin/pr/1264'
---

dadf85ade12c75675cd20932e26d723d17a718f1