From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 8 Jul 2006 17:29:42 +0000 (+0200)
Subject: Merge branch 'master' into processes
X-Git-Tag: collectd-3.11.0~76^2~7
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=4f92a7bbf4e487d7180912035714dfa121ee2246;p=collectd.git

Merge branch 'master' into processes
---

4f92a7bbf4e487d7180912035714dfa121ee2246