Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 29 Nov 2010 18:03:58 +0000 (21:03 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 29 Nov 2010 18:03:58 +0000 (21:03 +0300)

Trivial merge