From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 25 May 2016 14:53:06 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~12
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2c7b491427fd84c9e24c9d41686a15ce42219a0b

Merge branch 'collectd-5.4' into collectd-5.5
---

2c7b491427fd84c9e24c9d41686a15ce42219a0b