Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 20 Apr 2010 14:05:13 +0000 (18:05 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 20 Apr 2010 14:05:13 +0000 (18:05 +0400)
commitf9d03a99241dea980899cf391ba51bc08fdb5392
treef9d67c2f74c65b0e5bdee5555a18e8d18602f3de
parentfa656f7af6ea02b3e770dadc88ee965ac583cdc8
parent70c9c910ea8cf8d5b7ff99f92b9b2e0f0c941e2c
Merge branch 'master' of git.labs.intellij.net:idea/community