mirror of https://github.com/ethereum/go-ethereum
Merge branch 'develop' of https://github.com/james-c/eth-go into james-c-develop
Conflicts: ethdb/database.gopull/150/head
commit
8ee8ec8a36