Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

Conflicts:
	README.md
This commit is contained in:
obscuren 2015-02-05 12:36:30 -08:00
commit cad53fa191

@ -1,5 +1,4 @@
Ethereum Go
========
## Ethereum Go
Ethereum Go Client © 2014 Jeffrey Wilcke.