From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 22 Jul 2006 20:36:46 +0000 (+0200)
Subject: Merge branch 'collectd-3.10'
X-Git-Tag: collectd-3.11.0~74
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b75b88c7dcb5e648dbc4bec2e2fbbaa3778b78b4;p=collectd.git

Merge branch 'collectd-3.10'
---

b75b88c7dcb5e648dbc4bec2e2fbbaa3778b78b4