From: Florian Forster <octo@collectd.org>
Date: Sat, 5 Dec 2015 21:06:35 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=791e99923dbbf045b11fbd7b0ea8df647e29593e;p=thirdparty%2Fcollectd.git

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

791e99923dbbf045b11fbd7b0ea8df647e29593e