Merge remote-tracking branch 'origin/master' into mikhail.golubev/py-attribute-inference
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 20 Feb 2015 18:31:01 +0000 (21:31 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 20 Feb 2015 18:31:01 +0000 (21:31 +0300)
commit5a438555f14ee32ff9c9419dec0354999ac961cb
tree719af5f9f3fd1663e960429a100916846f38f276
parentfda04c7ae361937331a89fee57877e2f43bf3522
parentd68d2ee5baa3afbf66dbb2c5126176971e92e381
Merge remote-tracking branch 'origin/master' into mikhail.golubev/py-attribute-inference
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
python/testSrc/com/jetbrains/python/PythonCompletionTest.java