From: Florian Forster <octo@collectd.org>
Date: Fri, 7 Sep 2012 09:19:52 +0000 (+0200)
Subject: Merge branch 'collectd-5.1'
X-Git-Tag: collectd-5.2.0~62
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=59dded4cc1a2077ad11c6e9b507e15ad19e0e38c;p=collectd.git

Merge branch 'collectd-5.1'
---

59dded4cc1a2077ad11c6e9b507e15ad19e0e38c