Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 27 Feb 2013 15:26:16 +0000 (19:26 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 27 Feb 2013 15:26:16 +0000 (19:26 +0400)
commit925c25e0ea62e1f30eeb00521fc3956c31d6831a
treeadc191536604e641ceb8cba13406928c64144876
parent9171a3d9bfdaa54b8925d5a29b36fcdf7c862f46
parentc6236f15892d78f7fea261f8712ea9e98eaf8538
Merge remote-tracking branch 'origin/master'

Conflicts:
python/ideSrc/com/jetbrains/python/PyIdeCommonOptionsForm.java
python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.form
python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
python/src/com/jetbrains/python/packaging/PyPIPackageUtil.java