From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 8 Apr 2015 22:32:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/925'
X-Git-Tag: collectd-5.5.0~51
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=cfe801cf0236ea2fade924e0f2b5ce3d1a51698a;p=collectd.git

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

cfe801cf0236ea2fade924e0f2b5ce3d1a51698a