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)

Trivial merge