From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 13 Jun 2010 19:44:21 +0000 (+0200)
Subject: Merge branch 'collectd-4.10'
X-Git-Tag: collectd-5.0.0-beta0~106
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=37e18082cfb22491138e282074c5267df48dd8de;p=collectd.git

Merge branch 'collectd-4.10'
---

37e18082cfb22491138e282074c5267df48dd8de