From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 9 Mar 2009 17:48:12 +0000 (+0100)
Subject: Merge branch 'collectd-4.6'
X-Git-Tag: collectd-4.7.0~106
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6a69db4d304118e11fd4bae9c761fc14674e4942;p=collectd.git

Merge branch 'collectd-4.6'
---

6a69db4d304118e11fd4bae9c761fc14674e4942