From: Florian Forster <octo@collectd.org>
Date: Mon, 14 Jan 2013 09:53:21 +0000 (+0100)
Subject: Merge branch 'collectd-5.1' into collectd-5.2
X-Git-Tag: collectd-5.2.1~7
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=defd9a4014a34640b1228bbcb96e6aa99e8bbb37;p=collectd.git

Merge branch 'collectd-5.1' into collectd-5.2
---

defd9a4014a34640b1228bbcb96e6aa99e8bbb37