From: Florian Forster <octo@collectd.org>
Date: Sun, 23 Sep 2012 10:22:37 +0000 (+0200)
Subject: Merge branch 'collectd-5.1'
X-Git-Tag: collectd-5.2.0~60
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5347744b510e0a94639905e0263689bf46d90de2;p=collectd.git

Merge branch 'collectd-5.1'
---

5347744b510e0a94639905e0263689bf46d90de2