From: Nicolas JOURDEN <nicolas.jourden@laposte.net>
Date: Fri, 20 Nov 2015 15:44:08 +0000 (+0100)
Subject: Merging with changes made by Florian Foster.
X-Git-Tag: collectd-5.6.0~73^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6ca14739ed8cc76de14bd9ac4d549ba2c7c72a93;p=collectd.git

Merging with changes made by Florian Foster.
---

6ca14739ed8cc76de14bd9ac4d549ba2c7c72a93