Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 25 Jun 2010 06:21:56 +0000 (10:21 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 25 Jun 2010 06:21:56 +0000 (10:21 +0400)
commit5f4c8cd18b50bf078737442de418edb23c8a30ac
treeb51ce0330ce9160a182c90682dc34d0e01353181
parent1dda230120b388b78c8fc94f1e10ddc8569bc079
parent4e9206b9b5683f2002a1828b2a81758c71e46d2d
Merge branch 'master' of git.labs.intellij.net:idea/community