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)
1  2 
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
python/testSrc/com/jetbrains/python/PythonCompletionTest.java

Simple merge