From: Florian Forster <octo@collectd.org>
Date: Mon, 27 Aug 2012 08:12:11 +0000 (+0200)
Subject: Merge branch 'sh/collectd-5.1' into collectd-5.1
X-Git-Tag: collectd-5.1.1~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=180f2ba844e00bd0e73acc5b4445b48652e47dcd;p=collectd.git

Merge branch 'sh/collectd-5.1' into collectd-5.1
---

180f2ba844e00bd0e73acc5b4445b48652e47dcd