From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 1 May 2010 09:00:26 +0000 (+0200)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=96382507c3296a35399f6b3c258ae2a47761bf06

Merge branch 'collectd-4.9'
---

96382507c3296a35399f6b3c258ae2a47761bf06