Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 7 Jul 2010 10:01:48 +0000 (14:01 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 7 Jul 2010 10:01:48 +0000 (14:01 +0400)
commitb2c2a0d001629c60a62768d569a6c0e3fabc1e85
tree1aa184c2c7e0ace7723c467d5f6ba862b83ba4c0
parenta0e5c191937bf4772f44f588dfe7998faed5ce09
parentaafc819f30bd8c18bf9ccde94b33f89dad3e5bac
Merge branch 'master' of git.labs.intellij.net:idea/community