From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 8 Dec 2009 18:58:59 +0000 (+0100)
Subject: Merge remote branch 'trenkel/master'
X-Git-Tag: collectd-4.9.0~22
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d664ba8f034f1f57a01d1547f27238876e43bcc1;p=collectd.git

Merge remote branch 'trenkel/master'
---

d664ba8f034f1f57a01d1547f27238876e43bcc1