Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Sun, 6 Dec 2009 15:28:00 +0000 (18:28 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Sun, 6 Dec 2009 15:28:00 +0000 (18:28 +0300)

Trivial merge