From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 26 Mar 2016 13:24:02 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~376
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5c2993e4121feae745551be182221b31bc23ff97;p=collectd.git

Merge branch 'collectd-5.5'
---

5c2993e4121feae745551be182221b31bc23ff97