Merge remote-tracking branch 'ethereum/develop' into sol_import

Conflicts:
	libsolidity/CompilerStack.cpp
	libsolidity/CompilerStack.h
	solc/main.cpp

1 files changed, 3 insertions, 1 deletions

diff --git a/main.cpp b/main.cpp
index 3284be74..b4cbc6ae 100644
--- a/main.cpp
+++ b/main.cpp
@@ -147,7 +147,9 @@ int main(int argc, char** argv)
 		cout << "Opcodes:" << endl
 			 << eth::disassemble(compiler.getBytecode(contract)) << endl
 			 << "Binary: " << toHex(compiler.getBytecode(contract)) << endl
-			 << "Interface specification: " << compiler.getInterface(contract) << endl;
+			 << "Interface specification: " << compiler.getJsonDocumentation(contract, ABI_INTERFACE) << endl
+			 << "Natspec user documentation: " << compiler.getJsonDocumentation(contract, NATSPEC_USER) << endl
+			 << "Natspec developer documentation: " << compiler.getJsonDocumentation(contract, NATSPEC_DEV) << endl;
 	}
 
 	return 0;