From: Florian Forster <octo@collectd.org>
Date: Wed, 10 Apr 2013 01:44:29 +0000 (-0700)
Subject: Merge branch 'collectd-5.2'
X-Git-Tag: collectd-5.3.0~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d11c1f68458465f1c9dcfd0396704b7fba7d5804;p=collectd.git

Merge branch 'collectd-5.2'
---

d11c1f68458465f1c9dcfd0396704b7fba7d5804