From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 3 Aug 2015 21:26:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1175'
X-Git-Tag: collectd-5.6.0~624
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5dcf6b9a54e94c2fa829c9077bfb3e829c6e89ba;p=collectd.git

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

5dcf6b9a54e94c2fa829c9077bfb3e829c6e89ba