From: Florian Forster <octo@collectd.org>
Date: Sun, 18 Aug 2013 10:13:48 +0000 (+0200)
Subject: Merge branch 'collectd-5.2' into collectd-5.3
X-Git-Tag: collectd-5.4.0~1^2
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=c023314cc01ec8fae3f5373aa9dbf2b2a2d339b3

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

c023314cc01ec8fae3f5373aa9dbf2b2a2d339b3