Merge branch 'pycharm-interpreters-rework'

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

Mon, 17 Feb 2014 08:41:12 +0000 (12:41 +0400)

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

Mon, 17 Feb 2014 08:41:12 +0000 (12:41 +0400)
author Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 17 Feb 2014 08:41:12 +0000 (12:41 +0400)
committer Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 17 Feb 2014 08:41:12 +0000 (12:41 +0400)
diff --cc platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java
Simple merge
diff --cc python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
Simple merge
author	Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
	Mon, 17 Feb 2014 08:41:12 +0000 (12:41 +0400)
committer	Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
	Mon, 17 Feb 2014 08:41:12 +0000 (12:41 +0400)
		1	2
platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history
python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history