Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 29 Jun 2010 06:24:11 +0000 (10:24 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 29 Jun 2010 06:24:11 +0000 (10:24 +0400)
commitf1386f8c406a62b8bf08d13402ba13ce6ec60cd6
treee29aa4fc9b56ed08cb12c1dabcd10332dcfddafa
parentfa22e7b0c913394a2a4d3ea484c596e09042f91a
parent070979ced41ecf039ee4d57ee3be39bc50bd5b2d
Merge branch 'master' of git.labs.intellij.net:idea/community