Merge branch 'develop'

This commit is contained in:
Jeffrey Wilcke 2015-08-05 18:41:08 +02:00
commit 82ef26f600

@ -54,7 +54,7 @@ const (
)
var (
gitCommit string // set via linker flag
gitCommit string // set via linker flagg
nodeNameVersion string
app *cli.App
)