From: Florian Forster <octo@collectd.org>
Date: Fri, 2 Sep 2011 01:34:00 +0000 (-0400)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~49
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f538eec45e95ee6238754324e6d84d97108af540;p=collectd.git

Merge branch 'collectd-5.0'
---

f538eec45e95ee6238754324e6d84d97108af540