Merge branch 'master' of git@git.labs.intellij.net:idea/community
commit346e9f06c8028b1f24249dfbe4f5c754e56d62ad
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 16 Feb 2010 09:39:10 +0000 (16 12:39 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 16 Feb 2010 09:39:10 +0000 (16 12:39 +0300)
treefae844c8faefe8ad6c31763c1f38506ef58efa9e
parent11a8788cce2bd8018dee54daf605baf45b0413e6
parent0097e610515dab9738c19847646ac909def409cf
Merge branch 'master' of git@git.labs.intellij.net:idea/community