From: Florian Forster <octo@collectd.org>
Date: Thu, 11 Oct 2012 19:58:31 +0000 (+0200)
Subject: Merge branch 'collectd-5.1'
X-Git-Tag: collectd-5.2.0~37
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5eb71045f1d3b72b17e922a86b5014f68345b5b3;p=collectd.git

Merge branch 'collectd-5.1'
---

5eb71045f1d3b72b17e922a86b5014f68345b5b3