Merge remote-tracking branch 'origin/master' into numpy-array-view
authorAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Fri, 17 Oct 2014 11:51:56 +0000 (15:51 +0400)
committerAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Fri, 17 Oct 2014 11:51:56 +0000 (15:51 +0400)
Conflicts:
python/testSrc/com/jetbrains/python/PyTypeTest.java

1  2 
platform/platform-resources-en/src/messages/ActionsBundle.properties