Marek Kotewicz 7aca17e071 Merge branch 'develop' into allevents
Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js
	test/contract.js
2015-06-24 12:09:04 +02:00
..
2015-06-22 14:04:28 +02:00
2015-06-23 16:23:36 +02:00
2015-06-24 11:49:10 +02:00