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)
commit1126617bebe569dffe6b7a5d3f0c400134b41d65
tree9ae878663b6bf06a0ccbe803b9a89e3f82852427
parentbd84c0f19f7010e33cedfd0549250135c73f6c00
parentfbb3f791c3b072dc09e8ecd339f6e4808fdd8299
Merge remote-tracking branch 'github-tokkee/sh/empty-config'