Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 29 Oct 2010 12:46:05 +0000 (16:46 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 29 Oct 2010 12:46:05 +0000 (16:46 +0400)
commit454da048459b70217d782a66a2400ccd7aede561
treec0436857a994cea10cdeae78913f3b18e137071a
parent07a5d33ea6fe4e794d4e924f2b3b7bcce3ee60b2
parentb2e4148d852974962c6128bce8123acb79450143
Merge branch 'master' of git.labs.intellij.net:idea/community