From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 17 Jun 2015 13:03:18 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~679
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3489284330462f4edc85a75445a5cc8014e29db0;p=collectd.git

Merge branch 'collectd-5.5'
---

3489284330462f4edc85a75445a5cc8014e29db0