From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 11 Dec 2015 20:56:40 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59547eb66a3743ca0b458222d7a4318f3e659a60;p=thirdparty%2Fcollectd.git

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

59547eb66a3743ca0b458222d7a4318f3e659a60