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

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

09c57e6f2fa67509f815245329610ef0658709f7