From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 26 Feb 2016 21:58:15 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~471
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d38c16d60f9d1b10cb60f010ce086135e6ecbe07;p=collectd.git

Merge branch 'collectd-5.5'
---

d38c16d60f9d1b10cb60f010ce086135e6ecbe07