From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 8 Apr 2015 22:08:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/993'
X-Git-Tag: collectd-5.5.0~56
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=76d9c9033e021cbdb0da0fc2b0ad23bc3d7ad487;p=collectd.git

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

76d9c9033e021cbdb0da0fc2b0ad23bc3d7ad487