Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 15 Feb 2010 13:00:23 +0000 (15 16:00 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 15 Feb 2010 13:00:23 +0000 (15 16:00 +0300)

Trivial merge