From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 25 May 2007 17:51:59 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.0.0~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=011b30ce3a419d543040102bb3d077e7fbd4aa0f;p=collectd.git

Merge branch 'pull/master'
---

011b30ce3a419d543040102bb3d077e7fbd4aa0f