From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Thu, 23 Aug 2007 06:05:56 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.1.0~28
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3b19fa6b46228ad7966e10a89856fb46da0f7739;p=collectd.git

Merge branch 'pull/master'
---

3b19fa6b46228ad7966e10a89856fb46da0f7739