From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 21 Jan 2008 10:12:50 +0000 (+0100)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.3.0beta0~34^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d86c4d2097fdb259915ee8f80b1ed59be6e0d994;p=collectd.git

Merge branch 'pull/master'
---

d86c4d2097fdb259915ee8f80b1ed59be6e0d994