From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 26 Jul 2016 10:50:36 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~147
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ab11d1b4db61f750f51be6e41dbe8320d3c65404

Merge branch 'collectd-5.5'
---

ab11d1b4db61f750f51be6e41dbe8320d3c65404