Merge branch 'master' into uta-python
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Tue, 12 Jan 2016 09:47:31 +0000 (12:47 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Tue, 12 Jan 2016 09:47:31 +0000 (12:47 +0300)
commitfb368fcc778fe688552905f3e9506e69bfc916c7
tree50eab819e8fe359d8338ade76d81a9e6daaf8353
parent1b6146c930daea19d2e0f3d3bbab130e3496992f
parent59e1b2459fcc6a7e209c199f0aba44095decea36
Merge branch 'master' into uta-python

# Conflicts:
# python/src/com/jetbrains/python/run/PythonCommandLineState.java