Merge remote-tracking branch 'origin/master' into mikhail.golubev/py-attribute-inference
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 7 Oct 2014 09:33:00 +0000 (13:33 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 7 Oct 2014 09:58:42 +0000 (13:58 +0400)
commit98d4a7b83f0020eeee325f784195ec563155b77f
tree10765af93a8fb7eedd3793f63d0bf495c51cc1a0
parent1cd834d55b281ea611f678e582736e4936c49694
parent9d2a2daa9aeda82e4bae8e3f4a06e94dc56db22f
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/PyUtil.java