Merge branch 'master' of git.labs.intellij.net:idea/community
commit9e442ed759662a8cc94a25959b28459c8719e10e
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 21 Jan 2010 21:05:10 +0000 (22 00:05 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 21 Jan 2010 21:05:10 +0000 (22 00:05 +0300)
tree2fc1c4621cc13ed1b4138f854b5ad3a46cf243bf
parent26ebe725e433c47b96121caccbc11ca92d176aa5
parentd856d111bdb002fca228f5acaede9c1636b238f1
Merge branch 'master' of git.labs.intellij.net:idea/community