Merge commit 'ae9fdda9ac2b451b8f4cc46828a2b9f4bed872c8' into web3.js.6.0

Conflicts:
	libjsqrc/ethereumjs/dist/web3-light.js
	libjsqrc/ethereumjs/dist/web3-light.min.js
	libjsqrc/ethereumjs/dist/web3.js
	libjsqrc/ethereumjs/dist/web3.min.js
This commit is contained in:
Marek Kotewicz 2015-06-23 10:07:36 +02:00
commit a1ec0ba4cf

Diff Content Not Available