From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 16 Jun 2010 12:23:43 +0000 (+0200)
Subject: Merge remote branch 'jeromer/master'
X-Git-Tag: collectd-5.0.0-beta0~103
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7b814553432aec88ec454db4f3b4655b9657d4d2;p=collectd.git

Merge remote branch 'jeromer/master'
---

7b814553432aec88ec454db4f3b4655b9657d4d2