From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sun, 8 Nov 2015 20:26:26 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~581
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b39918bdadabb12ec040f0f191c0d21cb6ddd53;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.5'
---

9b39918bdadabb12ec040f0f191c0d21cb6ddd53