From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 17 Sep 2009 06:53:05 +0000 (+0200)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~81
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=11697a97e184c5c2648db0afbc78ad1a55bccede;p=collectd.git

Merge branch 'collectd-4.8'
---

11697a97e184c5c2648db0afbc78ad1a55bccede