Merge remote-tracking branch 'upstream/develop' into stateTests

Conflicts:
	libethereum/AddressState.h
	test/vm.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/vm.cpp b/vm.cpp
index d1728e2e..e8105ac6 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -252,9 +252,9 @@ void FakeExtVM::importExec(mObject& _o)
 	code = &thisTxCode;
 	if (_o["code"].type() == str_type)
 		if (_o["code"].get_str().find_first_of("0x") == 0)
-			thisTxCode = compileLLL(_o["code"].get_str());
-		else
 			thisTxCode = fromHex(_o["code"].get_str().substr(2));
+		else
+			thisTxCode = compileLLL(_o["code"].get_str());
 	else if (_o["code"].type() == array_type)
 		for (auto const& j: _o["code"].get_array())
 			thisTxCode.push_back(toByte(j));