Merge remote-tracking branch 'origin/master' into numpy-array-view
authorAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 11 Sep 2014 12:07:36 +0000 (16:07 +0400)
committerAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 11 Sep 2014 12:07:36 +0000 (16:07 +0400)
commitb724e9aa6365b919a9cd0ca2c35f2c091436648b
tree439c7881724244d42c84fada29fc274fc7a69616
parent5c12015f0981b8b6675f1b1240f23cd6e116be20
parent3a8fa7ff4e8926997cbe3616c5ed736d8b92946c
Merge remote-tracking branch 'origin/master' into numpy-array-view

Conflicts:
python/helpers/pydev/pydevd_vars.py
python/pydevSrc/com/jetbrains/python/debugger/PyDebugValue.java
python/helpers/pydev/pydevd_vars.py
python/src/META-INF/python-core.xml