Merge branch 'east825/py-move-to-toplevel'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 8 Oct 2015 09:02:11 +0000 (12:02 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 8 Oct 2015 09:02:11 +0000 (12:02 +0300)
1  2 
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/PyBundle.properties
python/src/com/jetbrains/python/psi/PyUtil.java
python/src/com/jetbrains/python/psi/impl/PyElementGeneratorImpl.java

Simple merge