Code

Merge remote-tracking branch 'github-tokkee/sh/empty-config'
authorFlorian Forster <octo@collectd.org>
Sat, 10 Nov 2012 08:05:54 +0000 (09:05 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 10 Nov 2012 08:05:54 +0000 (09:05 +0100)

Trivial merge