From: Florian Forster <octo@collectd.org>
Date: Sat, 21 Jan 2012 17:26:17 +0000 (+0100)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~43
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3dffa6fb50c66249fb3da7592c7a9385edb74677;p=collectd.git

Merge branch 'collectd-5.0'
---

3dffa6fb50c66249fb3da7592c7a9385edb74677