From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 5 Jan 2010 11:48:34 +0000 (+0100)
Subject: Merge branch 'master' into ff/routeros
X-Git-Tag: collectd-4.10.0~73^2~2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=b317e0c149e5ea17fda320b02002920fe887a67c

Merge branch 'master' into ff/routeros
---

b317e0c149e5ea17fda320b02002920fe887a67c