Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 11 Aug 2010 12:09:27 +0000 (16:09 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 11 Aug 2010 12:09:27 +0000 (16:09 +0400)
commitd7d34e02f70b2af8f5614562d5b155c27961aa23
tree59119d66c50839c034932ffa62f2f06b20ace644
parent716348d4bb22adf4b7d536bcb9211ab1d2bd72ed
parent047bbdd65d56bb18bb5a38a7521894f7b18cda03
Merge branch 'master' of git.labs.intellij.net:idea/community