Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 30 Apr 2010 18:05:40 +0000 (22:05 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 30 Apr 2010 18:05:40 +0000 (22:05 +0400)
commit5b2ecf56c1c1282472a46663e35115e291995a4a
treef007f5ada7f53a4f3495c8ab29f0accffca71332
parent9fb20d8c923db9c098b26bfd11eeb01693e2d1b7
parent57747fee5f87a3ebfd84c315cf20e11ecb9a1ac6
Merge branch 'master' of git.labs.intellij.net:idea/community