From: Florian Forster <octo@collectd.org>
Date: Wed, 16 Jan 2013 12:26:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2
X-Git-Tag: collectd-5.2.1~5
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=099531004e4b98e1e1d8a023975799708473b011

Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2
---

099531004e4b98e1e1d8a023975799708473b011