Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

Conflicts:
	test/vm.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/vm.cpp b/vm.cpp
index 1286df42..d7bc0612 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -384,7 +384,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 				o["callcreates"] = fev.exportCallCreates();
 				o["out"] = "0x" + toHex(output);
 				fev.push(o, "gas", gas);
-				o["logs"] = mValue(fev.exportLog());
+				o["logs"] = mValue(exportLog(fev.sub.logs));
 			}
 		}
 		else
@@ -402,7 +402,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 				dev::test::FakeExtVM test;
 				test.importState(o["post"].get_obj());
 				test.importCallCreates(o["callcreates"].get_array());
-				test.importLog(o["logs"].get_obj());
+				test.sub.logs = importLog(o["logs"].get_obj());
 
 				checkOutput(output, o);