From: Florian Forster <octo@collectd.org>
Date: Thu, 11 Oct 2012 20:04:03 +0000 (+0200)
Subject: Merge branch 'collectd-5.1'
X-Git-Tag: collectd-5.2.0~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=334b552e146d572d16333771c56b63b1ba30db2b;p=collectd.git

Merge branch 'collectd-5.1'
---

334b552e146d572d16333771c56b63b1ba30db2b