From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 20 May 2016 10:50:02 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b286b677bb54a3192a4121c2aa0857a133fd0603;p=thirdparty%2Fcollectd.git

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

b286b677bb54a3192a4121c2aa0857a133fd0603