From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 10 Jun 2016 07:48:23 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~226
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=38909dcf1dcb596c5f525c6bb25cf89c046013b5

Merge branch 'collectd-5.5'
---

38909dcf1dcb596c5f525c6bb25cf89c046013b5