Merge branch 'master' into traff/zip_helpers
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 31 Aug 2015 21:10:02 +0000 (23:10 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 31 Aug 2015 21:10:02 +0000 (23:10 +0200)
commitf0753d053c36dd91f44e3a2d76df72f981841a47
treea2072ce2c517b7da72744df13e75578cca52fc6a
parent90f22912897b3691924bbe4d7ffa848857796239
parent45b40aa178ce72138d8ad35d3110af8049c9da8e
Merge branch 'master' into traff/zip_helpers

# Conflicts:
# platform/util/src/com/intellij/openapi/util/BuildNumber.java
# python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
python/helpers/pydev/pydevd.py
python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.java
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
python/src/com/jetbrains/python/console/PydevConsoleRunnerFactory.java
python/src/com/jetbrains/python/debugger/PyDebugRunner.java
python/src/com/jetbrains/python/run/PythonCommandLineState.java
python/src/com/jetbrains/python/run/PythonTask.java
python/src/com/jetbrains/python/sdk/PythonSdkType.java