From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Apr 2015 07:23:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1001'
X-Git-Tag: collectd-5.5.0~41
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=021237b2bf08bd39f93ac44f88d56f3193f63078;p=collectd.git

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

021237b2bf08bd39f93ac44f88d56f3193f63078