From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 13 Aug 2015 21:35:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1188'
X-Git-Tag: collectd-5.6.0~615
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3348ace2cdd95bc1de5e28d11f3999cf5bd4ebf4;p=collectd.git

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

3348ace2cdd95bc1de5e28d11f3999cf5bd4ebf4