Merge branch 'topic/docker_python'
authorAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 5 Feb 2016 14:53:34 +0000 (17:53 +0300)
committerAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 5 Feb 2016 14:53:34 +0000 (17:53 +0300)
Conflicts:
platform/platform-impl/src/com/intellij/remote/RemoteConnectionCredentialsWrapper.java

1  2 
platform/platform-resources/src/META-INF/PlatformExtensions.xml