From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 21 Jan 2008 17:30:48 +0000 (+0100)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.3.0beta0~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06d0305ee967a12cb541dee87f79c31cac9d1b10;p=thirdparty%2Fcollectd.git

Merge branch 'pull/master'
---

06d0305ee967a12cb541dee87f79c31cac9d1b10