From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 11 May 2009 20:24:58 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~114
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=54232abc855778f381b96a63b75c1a97240402aa;p=collectd.git

Merge branch 'collectd-4.7'
---

54232abc855778f381b96a63b75c1a97240402aa