From: Florian Forster <octo@collectd.org>
Date: Sat, 23 Mar 2013 09:01:19 +0000 (+0100)
Subject: Merge branch 'collectd-5.1' into collectd-5.2
X-Git-Tag: collectd-5.2.2~8
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=21b429b6b5ecd2f9820d9a2516c12577a0e59d19;p=collectd.git

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

21b429b6b5ecd2f9820d9a2516c12577a0e59d19