From: Florian Forster <octo@collectd.org>
Date: Sun, 27 Mar 2011 17:06:47 +0000 (-0700)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~68
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=8a86b8aadab91e6c8af0210e69fd51a1f6c1056f;p=collectd.git

Merge branch 'collectd-5.0'
---

8a86b8aadab91e6c8af0210e69fd51a1f6c1056f