From: Florian Forster <octo@collectd.org>
Date: Fri, 12 Jul 2013 16:21:31 +0000 (+0200)
Subject: Merge branch 'collectd-5.2' into collectd-5.3
X-Git-Tag: collectd-5.3.1~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=bc389fa32a48a64306f7ec008f4548f05fdb7c80;p=collectd.git

Merge branch 'collectd-5.2' into collectd-5.3
---

bc389fa32a48a64306f7ec008f4548f05fdb7c80