From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 3 Mar 2016 21:16:31 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~454
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b758f3b7146f1497d93e1df64cbc0c14ae164768;p=collectd.git

Merge branch 'collectd-5.5'
---

b758f3b7146f1497d93e1df64cbc0c14ae164768