From: Florian Forster <octo@collectd.org>
Date: Sat, 28 Jan 2012 11:03:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
X-Git-Tag: collectd-5.0.3~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a24bf968e72f9a103a354dcc833619a40849cfcd;p=collectd.git

Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
---

a24bf968e72f9a103a354dcc833619a40849cfcd