Merge remote-tracking branch 'remotes/origin/master' into pycharm/docker
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 29 Sep 2015 16:53:57 +0000 (18:53 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 29 Sep 2015 16:53:57 +0000 (18:53 +0200)
1  2 
platform/platform-impl/src/com/intellij/remote/RemoteConnectionCredentialsWrapper.java
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/debugger/PyDebugProcess.java
python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java
python/src/com/jetbrains/python/sdk/PythonSdkType.java

Simple merge