Merge branch 'master' of git.labs.intellij.net:idea/community

diff --cc plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
index 696c098227e4ccc000b67a1647b0eac45d3b5923,d4de3bc0e17da3d48ed2226e62a2ef9a1835b160..11a6555a05d3b6c9219e04098b8c60c257e8b96f
--- 1/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
--- 2/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
+++ b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
@@@ -100,6 -100,4 +100,6 @@@ hg4idea.status.currentSituation.descrip
  hg4idea.warning.no-default-update-path=Skipped \"{0}\". No default update path.
  hg4idea.merge.please-commit=Merged heads, please commit repository \"{0}\"
  hg4idea.error.invalidExecutable=\"{0}\" is not a valid mercurial executable
 -hg4idea.integrate.other.head=Other head: {0}
 +hg4idea.integrate.other.head=Other head: {0}
 +
- hgidea.dialog.login.password.required=Login and password required
++hgidea.dialog.login.password.required=Login and password required

diff --cc plugins/hg4idea/src/META-INF/plugin.xml
Simple merge