Merge branch 'develop' into release/1.3.2

Conflicts:
	VERSION
	cmd/geth/main.go
This commit is contained in:
Jeffrey Wilcke
2015-11-24 13:48:47 +01:00
66 changed files with 3550 additions and 1783 deletions

View File

@ -1 +1 @@
1.3.1
1.3.2