Merge branch 'master' into PY-9727
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 9 Dec 2015 20:20:27 +0000 (23:20 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 9 Dec 2015 20:20:27 +0000 (23:20 +0300)
1  2 
python/src/META-INF/python-core.xml

Simple merge