From: Florian Forster <octo@collectd.org>
Date: Wed, 2 Nov 2016 08:20:57 +0000 (+0100)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4979d8dcd6f097eb8fd4661086e28accd31ff905;p=collectd.git

Merge branch 'collectd-5.5' into collectd-5.6
---

4979d8dcd6f097eb8fd4661086e28accd31ff905