From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 1 Mar 2016 14:01:25 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~458
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6164fe4456716e6dc36aaa2ab617b104a7ac5ff3;p=collectd.git

Merge branch 'collectd-5.5'
---

6164fe4456716e6dc36aaa2ab617b104a7ac5ff3