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

Conflicts: README.md

Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts: README.md
cad53fa1 · obscuren · 0e682d93 · cec30e23 · cad53fa1
Commit cad53fa1 authored Feb 05, 2015 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

README.md README.md +1 -2

No files found.
--- a/README.md
+++ b/README.md
-Ethereum Go
-========
+## Ethereum Go

 Ethereum Go Client © 2014 Jeffrey Wilcke.