Merge branch 'master' of git.labs.intellij.net:idea/community
commit56136e84d27119476fa0e7e3c193b26b99270c39
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 1 Feb 2010 10:55:04 +0000 (1 13:55 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 1 Feb 2010 10:55:04 +0000 (1 13:55 +0300)
tree0f0e4e4821d5faaae711c78a787595b4736b6586
parentd259161584905006b4f3673f5c42c7a4b0c1bb8a
parentf773be416761765de8c8faa54cf427c2ecc38e49
Merge branch 'master' of git.labs.intellij.net:idea/community