Nikolay Volf 5837b6e131 Merge branch 'master' into coverage-effort ... Conflicts: ethcore/res/ethereum/tests		2016-01-31 18:40:59 +04:00
..
ethereum	Merge branch 'master' into coverage-effort	2016-01-31 18:40:59 +04:00