From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 16 Nov 2010 11:20:18 +0000 (+0100)
Subject: Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
X-Git-Tag: collectd-4.9.4~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0a6626747f40f7a39947033e8e64242e731cd7e1;p=collectd.git

Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
---

0a6626747f40f7a39947033e8e64242e731cd7e1