From: Florian Forster <octo@collectd.org>
Date: Thu, 21 Jul 2016 05:49:50 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~200
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=290741f2e6de9e9b467463c1f0c6f031c4036428;p=collectd.git

Merge branch 'collectd-5.5'
---

290741f2e6de9e9b467463c1f0c6f031c4036428