From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 3 Aug 2015 21:26:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1181'
X-Git-Tag: collectd-5.6.0~623
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7e5979cba23f52cc8b2e188f1d205d4b0b8a2fa7;p=collectd.git

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

7e5979cba23f52cc8b2e188f1d205d4b0b8a2fa7