Merge branch 'master' of git.labs.intellij.net:idea/community pycharm/102.24
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 23 Dec 2010 06:33:09 +0000 (09:33 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 23 Dec 2010 06:33:09 +0000 (09:33 +0300)

Trivial merge