From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 15 Apr 2016 09:32:49 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~355
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=50345eec33951b964e2829e83c30399b71f2baba;p=collectd.git

Merge branch 'collectd-5.5'
---

50345eec33951b964e2829e83c30399b71f2baba