From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 3 Aug 2015 21:23:37 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a09f2fdf0450eb76317e1b7575a12ffb926068f4;p=thirdparty%2Fcollectd.git

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

a09f2fdf0450eb76317e1b7575a12ffb926068f4