Merge pull request #1750 from tokkee/sh/cli
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 6 Jun 2016 08:32:59 +0000 (10:32 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 6 Jun 2016 08:32:59 +0000 (10:32 +0200)
commitd3ca6fecf93f7c0cf32f38e02f66ce238dbf96b6
tree7cdf43979c571319e42c18cc132dadbbe3973731
parentecf283d6b114f4612d7ed6bb8f9a6a1cfea43d30
parent508981f522fb2fee97d2f8c55dd9d46806112a78
Merge pull request #1750 from tokkee/sh/cli

daemon: Let all command line options override global options from the config.