Merge branch 'master' of git.labs.intellij.net:idea/community
commit932b1540f49a68b67b82b6e58ca6642091b13477
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 4 Feb 2010 12:36:55 +0000 (4 15:36 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 4 Feb 2010 12:36:55 +0000 (4 15:36 +0300)
treec1519b80193f534dfef47655c17740993ff531f2
parent1893e54119c0d1621222011087063576663c3cba
parent18b9d6f2496e78f7bb1f3e9c8f22c1f2a8307c3c
Merge branch 'master' of git.labs.intellij.net:idea/community