Merge branch 'master' of git.labs.intellij.net:idea/community
commitc51c5248026d4e01fd4cbe2698bbe425cc45c2d1
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 22 Jan 2010 06:25:58 +0000 (22 09:25 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 22 Jan 2010 06:25:58 +0000 (22 09:25 +0300)
treead1bf747886594382891524854833ddb12ca86d3
parent5f5abb6b2b972122b0b7e7c96bf1775972f6eec7
parent76f27efbbfab697d2b1bc97a54c1a641419156a5
Merge branch 'master' of git.labs.intellij.net:idea/community