Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sat, 13 Nov 2010 16:47:48 +0000 (19:47 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sat, 13 Nov 2010 16:47:48 +0000 (19:47 +0300)
commit8cdf0d02ac0e4b3a820e626796e6c0afbfc54f05
tree9a90d1636c0d5144eed703642306fb645200c626
parenta8f668baaeb7b9c713bbfb7d81c13f0f7598ac8d
parentbe9fbe2657e7f4a6a7edf3d8a7cef7926e8cb0be
Merge branch 'master' of git.labs.intellij.net:idea/community