From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 5 Feb 2009 21:54:24 +0000 (+0100)
Subject: Merge branch 'ff/local'
X-Git-Tag: collectd-4.6.0~54
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d54dfab9b049de396e6a38d690d5f18917e093ea;p=collectd.git

Merge branch 'ff/local'
---

d54dfab9b049de396e6a38d690d5f18917e093ea