Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/bineditor/bineditorplugin.cpp

src/plugins/git/gitcommand.cpp

@@ -189,7 +189,7 @@ void GitCommand::run()
 
     // Special hack: Always produce output for diff
     if (ok && stdOut.isEmpty() && m_jobs.front().arguments.at(0) == QLatin1String("diff")) {
-        stdOut += "The file does not differ from HEAD";
+        stdOut += "No difference to HEAD";
     } else {
         // @TODO: Remove, see below
         if (ok && m_jobs.front().arguments.at(0) == QLatin1String("status"))