From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 26 Mar 2008 08:56:41 +0000 (+0100)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.4.0~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8fc151794f5e3ca5c86259dbe201c41bae861d0;p=thirdparty%2Fcollectd.git

Merge branch 'pull/master'
---

e8fc151794f5e3ca5c86259dbe201c41bae861d0