Merge branch 'master' of git.labs.intellij.net:idea/community cidr/98.299 idea/98.300 pycharm/98.301 rubymine/98.302
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sat, 6 Nov 2010 18:28:41 +0000 (21:28 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sat, 6 Nov 2010 18:28:41 +0000 (21:28 +0300)

Trivial merge