From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 7 Feb 2011 07:47:35 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.0.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dc9287f4de0283ae986444377075dcbdada2871;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.10' into collectd-5.0
---

4dc9287f4de0283ae986444377075dcbdada2871