Merge branch 'master' of git.labs.intellij.net:idea/community
commitd564e8cfce1faf0601092f7ec55b2ba482a612fd
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 22 Jan 2010 14:59:07 +0000 (22 17:59 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 22 Jan 2010 14:59:07 +0000 (22 17:59 +0300)
treee4d32830161ded4dee665a865ee286d23cf5e44f
parentc1dcb93539b1b20f371c1afcc30b3f27baea789d
parent1c5445f1bce8d0a0b2730364abdb3724fed1bcb2
Merge branch 'master' of git.labs.intellij.net:idea/community