Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 17 Aug 2010 13:03:09 +0000 (17:03 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 17 Aug 2010 13:03:09 +0000 (17:03 +0400)

Trivial merge