From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 15 Mar 2010 21:43:05 +0000 (+0100)
Subject: Merge branch 'cstenac'
X-Git-Tag: collectd-4.10.0~54
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3b84d1b7d3603c6134ec3bf85c976d1f13192c03;p=collectd.git

Merge branch 'cstenac'
---

3b84d1b7d3603c6134ec3bf85c976d1f13192c03