Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Christoph Jentzsch 2014-10-07 15:47:34 +02:00
commit ffd6bc97ad

View File

@ -468,7 +468,7 @@
} }
}, },
"945304eb96065b2a98b57a48a06ae28d285a71b5" : { "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23", "balance" : "46",
"code" : "0x600035560f6009590060203560003557", "code" : "0x600035560f6009590060203560003557",
"nonce" : "0", "nonce" : "0",
"storage" : { "storage" : {
@ -1482,4 +1482,4 @@
} }
} }
} }
} }