From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sun, 12 Apr 2015 07:26:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/998'
X-Git-Tag: collectd-5.5.0~43
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=dc7e14787cc4273927d5d0cdbd00fd41a0bee928

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

dc7e14787cc4273927d5d0cdbd00fd41a0bee928