From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 10 May 2016 07:15:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1701'
X-Git-Tag: collectd-5.6.0~303
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1e9a54ced9f7f7ae8a3565fc6799ac5ca76ac544;p=collectd.git

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

1e9a54ced9f7f7ae8a3565fc6799ac5ca76ac544