Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 9 Apr 2014 08:12:14 +0000 (12:12 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 9 Apr 2014 08:12:14 +0000 (12:12 +0400)
1  2 
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/PyBundle.properties

Simple merge