Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 29 Jun 2010 12:24:03 +0000 (16:24 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 29 Jun 2010 12:24:03 +0000 (16:24 +0400)
commit3cceffa4b83f462aff324eb2b89e157bdb169ac4
tree2d58db2fc2a4c013bc680d446897e5a84995c2b2
parentbb8cbeb2122e00dfb1a4e423cf5b15429058038a
parent2bad1c7932c6e5e91c467254facfb61f9ceb7dd1
Merge branch 'master' of git.labs.intellij.net:idea/community