Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 1 Mar 2010 16:14:11 +0000 (19:14 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 1 Mar 2010 16:14:11 +0000 (19:14 +0300)
commitb656a15555351b6db78e0445c2ca4d4c47166285
tree17080e06648a698c5f05ec07d31878d00623dd6a
parent4fa92b03fea29c81ed7b7adc94a7c0d722e42ec1
parentb6a7d46ae3f88dc478a8a255726ce6ba9102146a
Merge branch 'master' of git@git.labs.intellij.net:idea/community