From: Florian Forster <octo@huhu.verplant.org>
Date: Sat, 1 Sep 2007 09:07:58 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.1.0~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5d11ec8b345664776eeb7c977679c7adb705e129;p=collectd.git

Merge branch 'pull/master'
---

5d11ec8b345664776eeb7c977679c7adb705e129