From: Florian octo Forster <octo@dev4.office.noris.de>
Date: Wed, 27 Feb 2008 09:24:03 +0000 (+0100)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.4.0~87^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb475b66fb27f1c06f1d4ecfc910ccbd36216a41;p=collectd.git

Merge branch 'pull/master'
---

fb475b66fb27f1c06f1d4ecfc910ccbd36216a41