Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 14 Dec 2010 19:14:20 +0000 (22:14 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 14 Dec 2010 19:14:20 +0000 (22:14 +0300)

Trivial merge