From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 6 Dec 2015 15:40:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'collectd/collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~23
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0c004681a480e919b779584814eb396f6e6948ca;hp=--cc;p=collectd.git

Merge remote-tracking branch 'collectd/collectd-5.4' into collectd-5.5
---

0c004681a480e919b779584814eb396f6e6948ca