From: Florian Forster <octo@collectd.org>
Date: Sun, 7 Apr 2013 17:23:27 +0000 (+0200)
Subject: Merge branch 'collectd-5.1' into collectd-5.2
X-Git-Tag: collectd-5.2.2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=842c1a2d2a640151a89b9de7f4acd3b6a058c799;p=collectd.git

Merge branch 'collectd-5.1' into collectd-5.2
---

842c1a2d2a640151a89b9de7f4acd3b6a058c799