From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 3 Jun 2016 10:51:59 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=22651d8d4dc49e24bbac2cd34e0642dcf3639c97;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

22651d8d4dc49e24bbac2cd34e0642dcf3639c97