From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 26 Aug 2015 22:44:23 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~606
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=8eb05d21637cd1eb3b6c4c4d3ed519cc2fd3ebf6;p=collectd.git

Merge branch 'collectd-5.5'
---

8eb05d21637cd1eb3b6c4c4d3ed519cc2fd3ebf6