Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 30 Apr 2010 18:05:40 +0000 (22:05 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 30 Apr 2010 18:05:40 +0000 (22:05 +0400)

Trivial merge