From: Florian Forster <octo@noris.net>
Date: Wed, 21 Oct 2009 09:36:17 +0000 (+0200)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~44
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=125e5cc99a45773dc7559e5478564fbc52f16623;p=collectd.git

Merge branch 'collectd-4.8'
---

125e5cc99a45773dc7559e5478564fbc52f16623