From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 1 May 2010 09:02:57 +0000 (+0200)
Subject: Merge remote branch 'powdahound/master'
X-Git-Tag: collectd-4.10.0~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ff8390d53b08dd36f8b0c5f4e530fe7ea9f21b90;p=collectd.git

Merge remote branch 'powdahound/master'
---

ff8390d53b08dd36f8b0c5f4e530fe7ea9f21b90