Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 21 Jan 2010 13:14:38 +0000 (16:14 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 21 Jan 2010 13:14:38 +0000 (16:14 +0300)
commit8bd20a0675c3ef017c92cfb2f9211914987d7aa6
treef460b728ac44ce155d4c190a036d6156de75414a
parentcaf4cea3406c3be5524baf1231a054e691c4aa3d
parentfa3661f213696f152fa6f9e5d614e6bdbc9c3f0a
Merge branch 'master' of git@git.labs.intellij.net:idea/community