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)
commit7b0366a0e2ab1e5c884665901ec42e6e1bb293b9
treefcd17893fd5e4604ce5984c3f22e3208f54c7489
parent55a4e59cdf78ad75e4cbf1931353b10e152e8aae
parent8aa50f14634730c14199e59ec94c73306643d054
Merge branch 'topic/docker_python'

Conflicts:
platform/platform-impl/src/com/intellij/remote/RemoteConnectionCredentialsWrapper.java
platform/platform-resources/src/META-INF/PlatformExtensions.xml