From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 27 May 2009 13:03:53 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~105
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=daa4b5ab990fac569e684ab8850792bec0a19159;p=collectd.git

Merge branch 'collectd-4.7'
---

daa4b5ab990fac569e684ab8850792bec0a19159