From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 15 Apr 2016 19:04:04 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~348
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5841d1fb13436af787c748a965084cb06e66d326;p=collectd.git

Merge branch 'collectd-5.5'
---

5841d1fb13436af787c748a965084cb06e66d326