From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 23 Jan 2014 13:19:20 +0000 (+0100)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19a89bf824f1a984fbdbd42a68ce113faadb04ea;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.3' into collectd-5.4
---

19a89bf824f1a984fbdbd42a68ce113faadb04ea