From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 11 Sep 2015 20:41:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1135'
X-Git-Tag: collectd-5.6.0~596
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1978dba8e613eb01581b3376a42137e6fe11ca1a;p=collectd.git

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

1978dba8e613eb01581b3376a42137e6fe11ca1a