Merge branch 'master' of git@git.labs.intellij.net:idea/community
commitabd2250f9b6b17396d36fb06519c9a7818970f44
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 22 Jan 2010 10:37:25 +0000 (22 13:37 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 22 Jan 2010 10:37:25 +0000 (22 13:37 +0300)
tree24d64e36b16138089a842ad5ea18b96c410a0a0d
parent46ac351f057e9aeb688b5d938998c4bb68310352
parent2f0ff9a1598597a2c89626f58db7a068ddc86235
Merge branch 'master' of git@git.labs.intellij.net:idea/community