Marek Kotewicz c1136a08c0 Merge branch 'master' into develop
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
	package.json
2015-03-06 12:05:40 +01:00
..
2015-03-06 12:05:40 +01:00