From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 22 Apr 2010 09:29:19 +0000 (+0200)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~15
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=967a0fdefd43db0e4ed5f8cba65c3c345ef6cdfb

Merge branch 'collectd-4.9'
---

967a0fdefd43db0e4ed5f8cba65c3c345ef6cdfb