Merge pull request #1737 from chriseth/sol_fix_solcWithoutJson

Do not handle combined JSON if option not given.

solc/CommandLineInterface.cpp

@@ -380,6 +380,9 @@ bool CommandLineInterface::processInput()
 
 void CommandLineInterface::handleCombinedJSON()
 {
+	if (!m_args.count("combined-json"))
+		return;
+
 	Json::Value output(Json::objectValue);
 
 	set<string> requests;