Merge branch 'master' into traff/zip_helpers
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 21 Sep 2015 12:55:25 +0000 (14:55 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 21 Sep 2015 12:55:25 +0000 (14:55 +0200)
commit8b6ef8a22b50e0e830dc321d59f73f0991cff3e1
treefd716f5f8094703235b3f403c6f57bdda91a01f2
parent20b4051fec2a0f9516ec133f718e88f2471979cc
parent1d4f9a6263f09feddc46c99f0352b24a264977aa
Merge branch 'master' into traff/zip_helpers
python/helpers/pydev/pydevd.py
python/python-rest/src/com/jetbrains/rest/sphinx/SphinxBaseCommand.java
python/src/com/jetbrains/python/PythonHelper.java
python/src/com/jetbrains/python/PythonHelpersLocator.java
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
python/src/com/jetbrains/python/debugger/PyDebugRunner.java
python/src/com/jetbrains/python/documentation/docstrings/PyStructuredDocstringFormatter.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