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

Merge branch 'collectd-4.8'
---

b3facabd3ed3fa40c81a8122b78daffbbbdf34a6