Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 7 Dec 2009 11:06:48 +0000 (14:06 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 7 Dec 2009 11:06:48 +0000 (14:06 +0300)

Trivial merge