From: Florian Forster <octo@collectd.org>
Date: Sat, 6 Aug 2016 18:36:21 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~98
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e6798095bb2f063dd97619399575fef3e0fe501e;p=collectd.git

Merge branch 'collectd-5.5'
---

e6798095bb2f063dd97619399575fef3e0fe501e