Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
Conflicts: dist/web3-light.js dist/web3-light.min.js dist/web3.js dist/web3.min.js
This commit is contained in:
commit
811e3b2ca5
Conflicts: dist/web3-light.js dist/web3-light.min.js dist/web3.js dist/web3.min.js