From: Florian Forster <octo@collectd.org>
Date: Fri, 29 Mar 2013 20:30:21 +0000 (-0700)
Subject: Merge branch 'collectd-5.1' into collectd-5.2
X-Git-Tag: collectd-5.2.2~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=912c9b3f7c4a57fbf9ddd16db13d2651932ddb65;p=collectd.git

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

912c9b3f7c4a57fbf9ddd16db13d2651932ddb65