From: Florian Forster <octo@collectd.org>
Date: Wed, 9 Dec 2015 08:49:55 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0657d95eaa686d64efe6bbccda346ebd6467bd0b;p=thirdparty%2Fcollectd.git

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

0657d95eaa686d64efe6bbccda346ebd6467bd0b