From: Florian Forster <octo@collectd.org>
Date: Sat, 10 Nov 2012 08:05:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'github-tokkee/sh/empty-config'
X-Git-Tag: collectd-5.2.0~30
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1126617bebe569dffe6b7a5d3f0c400134b41d65;p=collectd.git

Merge remote-tracking branch 'github-tokkee/sh/empty-config'
---

1126617bebe569dffe6b7a5d3f0c400134b41d65