From: Florian Forster <octo@collectd.org>
Date: Thu, 18 Oct 2012 10:49:44 +0000 (+0200)
Subject: Merge branch 'collectd-5.1'
X-Git-Tag: collectd-5.2.0~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2979ae00227051ea79c9294ebfaf8337e8e308e2;p=collectd.git

Merge branch 'collectd-5.1'
---

2979ae00227051ea79c9294ebfaf8337e8e308e2