Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 26 Nov 2010 16:13:46 +0000 (19:13 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 26 Nov 2010 16:13:46 +0000 (19:13 +0300)
commitdc88a769410cfb9005a79f66ad9baa156293aa24
treec0bf8823cc632e5411619686172288c3d6a3856e
parent5ba8f981e85ed64b6a4551a4784b5bf4d18fed10
parent563873ae6e960dc3225184c7633d276b12ee688d
Merge branch 'master' of git@git.labs.intellij.net:idea/community