Merge branch 'master' of git@git.labs.intellij.net:idea/community
commit161136a42568fcf5a3925315e12c60e44da6fc14
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 9 Feb 2010 12:17:01 +0000 (9 15:17 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 9 Feb 2010 12:17:01 +0000 (9 15:17 +0300)
tree579aa76f7c028da058795efca55654c4ca6ee552
parent40e4f45204a58878e4c63420589ad6b23df83907
parentbfa696b00260612b815ce3e50743cb9430d7b8a7
Merge branch 'master' of git@git.labs.intellij.net:idea/community