From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 7 Jul 2015 22:35:27 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~649
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=872126c9a7e0a8f8ae2b28217c12c27c35af5237;p=collectd.git

Merge branch 'collectd-5.5'
---

872126c9a7e0a8f8ae2b28217c12c27c35af5237