From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 18 Dec 2009 10:26:52 +0000 (+0100)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~85
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eeae8f7fd3b1bbad7fbcfef7bde35a7b20148c87;p=collectd.git

Merge branch 'collectd-4.9'
---

eeae8f7fd3b1bbad7fbcfef7bde35a7b20148c87