From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 31 Oct 2010 16:15:06 +0000 (+0100)
Subject: Merge branch 'master' into ff/subsecond
X-Git-Tag: collectd-5.0.0-beta0~19^2~6
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=edd0e2639a241167e213ec301bfc71c7d291ee61

Merge branch 'master' into ff/subsecond
---

edd0e2639a241167e213ec301bfc71c7d291ee61