Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 2 Jul 2010 12:45:14 +0000 (16:45 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 2 Jul 2010 12:45:14 +0000 (16:45 +0400)
commit046314a15f9654efb242d00f0517f25449fd73cf
treea4001dd3a91da3709675ba8ace8ae4fcf8e697cc
parentd64fbc13cafc73a5eb5a7b89d719fd5d6071ece9
parent9cacc1b74f881d9bd86cab6cda81b3a5efbb251d
Merge branch 'master' of git.labs.intellij.net:idea/community