From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 25 Jun 2006 09:25:52 +0000 (+0200)
Subject: Merge branch 'svn-trunk'
X-Git-Tag: collectd-3.10.0~19
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=00432825e8e65164957c337fb29b3dd7b5133b8d;p=collectd.git

Merge branch 'svn-trunk'
---

00432825e8e65164957c337fb29b3dd7b5133b8d