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)
commit0e8173ae056bad3954aa7408e679c7165df9ae5b
treeb572a55e2afbe3a0010831a789d86cfbd4791f87
parent9307222cd6594deb891eac73517255175ebd8e55
parent5bc3f1d545e5f29820b3215d842cad0486d65c47
Merge remote-tracking branch 'origin/master'
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/PyBundle.properties