From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 11 Sep 2015 20:17:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1229'
X-Git-Tag: collectd-5.6.0~600
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=996f8b63eb79d98640174eeb3c26451b10c09dda;p=collectd.git

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

996f8b63eb79d98640174eeb3c26451b10c09dda