From: Florian Forster <octo@collectd.org>
Date: Sun, 27 Jan 2013 13:35:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2
X-Git-Tag: collectd-5.2.1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8291596f0172404039f0928bcaea4b1e4cafbc97;p=collectd.git

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

8291596f0172404039f0928bcaea4b1e4cafbc97