From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 7 Apr 2010 09:55:24 +0000 (+0200)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~20
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=593ea76dca367478b92e17f91e663fe7c67b4df9;p=collectd.git

Merge branch 'collectd-4.9'
---

593ea76dca367478b92e17f91e663fe7c67b4df9