From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 22 Mar 2010 18:27:33 +0000 (+0100)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56e1979ea2d1a373c614cd71c902435f46090da1;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.9'
---

56e1979ea2d1a373c614cd71c902435f46090da1