Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 12 Mar 2010 08:51:57 +0000 (11:51 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 12 Mar 2010 08:51:57 +0000 (11:51 +0300)

Trivial merge