From: Florian Forster <octo@collectd.org>
Date: Mon, 12 Nov 2012 07:28:16 +0000 (+0100)
Subject: Merge branch 'collectd-5.1'
X-Git-Tag: collectd-5.2.0~21
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e2bdca73d28ff16ab23af1d8eec984badb1a2513;p=collectd.git

Merge branch 'collectd-5.1'
---

e2bdca73d28ff16ab23af1d8eec984badb1a2513