From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 11 Sep 2015 20:34:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1260'
X-Git-Tag: collectd-5.6.0~597
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fc4db4e3f7ca3eac57bff54d3ced3ec0c3bcda70;p=collectd.git

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

fc4db4e3f7ca3eac57bff54d3ced3ec0c3bcda70