From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 15 Mar 2010 21:43:00 +0000 (+0100)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~55
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=070563c1ac6bf489cb13095ed30a6d290b98ac75;p=collectd.git

Merge branch 'collectd-4.9'
---

070563c1ac6bf489cb13095ed30a6d290b98ac75