From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 9 Mar 2010 15:55:20 +0000 (+0100)
Subject: Merge remote branch 'origin/collectd-4.8' into collectd-4.8
X-Git-Tag: collectd-4.8.4~17
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=0b02f790242b90e2a91102c7091e87cd3f6f5d76

Merge remote branch 'origin/collectd-4.8' into collectd-4.8
---

0b02f790242b90e2a91102c7091e87cd3f6f5d76