From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 1 Sep 2007 19:00:40 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.1.0~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bfe12932b1d1b9d05b210d1462228d34d37cbdc2;p=collectd.git

Merge branch 'pull/master'
---

bfe12932b1d1b9d05b210d1462228d34d37cbdc2