Merge branch 'master' of git@git.labs.intellij.net:idea/community
commit262c5cc8b29e1edaa5f34bb46a5ad38017d71257
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Sat, 23 Jan 2010 12:03:55 +0000 (23 15:03 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Sat, 23 Jan 2010 12:03:55 +0000 (23 15:03 +0300)
tree5ed694104eeb4ea697c412712c194f9402ead309
parentbd5fb7f65e35ef5f7b0d36c584065b8e62abe188
parent8c91a618e42266cb7d201480fc4bd8c3f6cdeedc
Merge branch 'master' of git@git.labs.intellij.net:idea/community