From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 6 Dec 2010 08:31:34 +0000 (+0100)
Subject: Merge branch 'collectd-4.10'
X-Git-Tag: collectd-5.0.0-beta0~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=565c731a4353d1453b65dc9a4267e1f8e4740c06;p=collectd.git

Merge branch 'collectd-4.10'
---

565c731a4353d1453b65dc9a4267e1f8e4740c06