Gav Wood
|
ded221fba2
|
Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop
Conflicts:
libjsqrc/ethereumjs/.travis.yml
libjsqrc/ethereumjs/README.md
libjsqrc/ethereumjs/dist/ethereum.js
libjsqrc/ethereumjs/dist/ethereum.js.map
libjsqrc/ethereumjs/lib/abi.js
libjsqrc/ethereumjs/package.json
|
2015-01-11 17:54:36 +01:00 |