Merge branch 'develop'

obscuren · obscuren · commit 82ef26f60079 · 2015-08-05T18:41:08.000+02:00
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -54,7 +54,7 @@ const (
 )
 
 var (
-	gitCommit       string // set via linker flag
+	gitCommit       string // set via linker flagg
 	nodeNameVersion string
 	app             *cli.App
 )

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ const (`
`54`	`54`	`)`
`55`	`55`
`56`	`56`	`var (`
`57`		`- gitCommit string // set via linker flag`
	`57`	`+ gitCommit string // set via linker flagg`
`58`	`58`	`nodeNameVersion string`
`59`	`59`	`app *cli.App`
`60`	`60`	`)`