From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 17 Sep 2009 08:16:40 +0000 (+0200)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~79
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=5a4daa815531077fdf8b3e425b92f88fa0abb42a

Merge branch 'collectd-4.8'
---

5a4daa815531077fdf8b3e425b92f88fa0abb42a