From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 3 Aug 2007 08:56:17 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.1.0~31
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ec7adf09a1df8b4b38330869c95a12eca15017a;p=collectd.git

Merge branch 'pull/master'
---

1ec7adf09a1df8b4b38330869c95a12eca15017a