From: Florian Forster <octo@collectd.org>
Date: Mon, 14 Jan 2013 09:53:29 +0000 (+0100)
Subject: Merge branch 'collectd-5.2'
X-Git-Tag: collectd-5.3.0~65
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=33e60ef35f745c56b1a5936272b1dd8b0cf63d12;p=collectd.git

Merge branch 'collectd-5.2'
---

33e60ef35f745c56b1a5936272b1dd8b0cf63d12