Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 2 Aug 2010 11:58:00 +0000 (15:58 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 2 Aug 2010 11:58:00 +0000 (15:58 +0400)

Trivial merge