Merge branch 'master' of git.labs.intellij.net:idea/community
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 1 Dec 2010 17:26:03 +0000 (20:26 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 1 Dec 2010 17:26:03 +0000 (20:26 +0300)
commitfeb6448d55abc2fc1a9b1f2d2bc11543bacf3ce3
treed76aab55b230ac8561c1dc26599752c110849724
parent6a7596b2aa5b830dea47ab61ea7ebc41614f00fa
parentc4e4f1a451c604646b2cac0dfbf3b3a1c9c78a44
Merge branch 'master' of git.labs.intellij.net:idea/community