Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 10 May 2016 09:20:00 +0000 (11:20 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 10 May 2016 09:20:00 +0000 (11:20 +0200)
commit74586357bc8a880579432f154a9cc57c0e1004ba
tree5d58c857a580d946d65319cc4f64b1e8f9a13186
parent42c40db21b2b74992b4e46336b0b80ae41373e16
parentdbbb6db6b45330f87462010030021bc5ee96a9fd
Merge remote-tracking branch 'origin/master' into IDEA-CR-10038

# Conflicts:
# platform/platform-resources-en/src/messages/IdeBundle.properties
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
platform/platform-resources-en/src/messages/IdeBundle.properties
platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
platform/util/resources/misc/registry.properties
plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java
plugins/git4idea/src/git4idea/commands/GitHttpAuthService.java