Merge remote-tracking branch 'origin/master'

author Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>

Wed, 9 Apr 2014 08:12:14 +0000 (12:12 +0400)

committer Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>

Wed, 9 Apr 2014 08:12:14 +0000 (12:12 +0400)
author Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 9 Apr 2014 08:12:14 +0000 (12:12 +0400)
committer Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 9 Apr 2014 08:12:14 +0000 (12:12 +0400)
diff --cc python/src/META-INF/python-core.xml
Simple merge
diff --cc python/src/com/jetbrains/python/PyBundle.properties
Simple merge
author	Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
	Wed, 9 Apr 2014 08:12:14 +0000 (12:12 +0400)
committer	Ekaterina 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	patch \|	diff1 \|	diff2 \|	blob \| history
python/src/com/jetbrains/python/PyBundle.properties	patch \|	diff1 \|	diff2 \|	blob \| history