Merge branch 'develop' into release/1.3.2

Conflicts: VERSION cmd/geth/main.go
Merge branch 'release/1.3.0'
2015-11-24 13:48:47 +01:00 · 2015-11-03 11:47:07 +01:00 · 2015-10-31 20:00:58 +01:00 · 2015-10-01 10:38:43 +02:00
2 changed files with 4 additions and 4 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-1.4.0
+1.3.2
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@ -48,10 +48,10 @@ import (

 const (
 	ClientIdentifier = "Geth"
-	Version          = "1.4.0-unstable"
+	Version          = "1.3.2"
 	VersionMajor     = 1
-	VersionMinor     = 4
-	VersionPatch     = 0
+	VersionMinor     = 3
+	VersionPatch     = 2
 )

 var (
Author	SHA1	Message	Date
Jeffrey Wilcke	5490437942	Merge branch 'develop' into release/1.3.2 Conflicts: VERSION cmd/geth/main.go	2015-11-24 13:48:47 +01:00
Jeffrey Wilcke	e5532154a5	Merge branch 'release/1.3.0' Conflicts: VERSION cmd/geth/main.go	2015-11-03 11:47:07 +01:00
Jeffrey Wilcke	f75becc264	cmd/geth, VERSION: bumped version 1.3.1	2015-10-31 20:00:58 +01:00
Jeffrey Wilcke	9666db2a44	VERSION, cmd/geth: bumped version 1.2.1	2015-10-01 10:38:43 +02:00
 @ -1 +1 @@
 .4.0
 .3.2