Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 20 Dec 2010 15:02:29 +0000 (18:02 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 20 Dec 2010 15:02:29 +0000 (18:02 +0300)
commit9a20101ac61c08ae4f332bc8bb8476aa948eb408
treedbb3a0b3a5f3316d24e8476e89b1404c51087613
parent19bef42f2fc788e64d5684387b7ea1383f245077
parentb9390a223be607080e05106c2fbeaba51474cae1
Merge branch 'master' of git.labs.intellij.net:idea/community