Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 17 Feb 2014 09:00:56 +0000 (13:00 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Mon, 17 Feb 2014 09:00:56 +0000 (13:00 +0400)
commit080c3cc05ef930513cf2cdf2feda14df7c23a2aa
treed945d9c295c8443567b95bbe0388c0c1f7ccc0f7
parent0be5b2201f3cbe9dff5a483255d7230a207034d7
parent6adb3a3749b5bcde53e221b3f839fccee3e5308d
Merge remote-tracking branch 'origin/master'

Conflicts:
platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java
platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java
python/src/META-INF/pycharm-core.xml