From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 18 Mar 2016 12:03:37 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=25b5f5c49dd50c64f41b7bf69b8e471b0ffc6f15;p=collectd.git

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

25b5f5c49dd50c64f41b7bf69b8e471b0ffc6f15