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

Merge branch 'collectd-5.0'
---

081695d86026186373a76a4c6b6abacd21b3c3c6