Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Mon, 19 Jul 2010 10:52:34 +0000 (14:52 +0400)
committerDmitry Jemerov <yole@jetbrains.com>
Mon, 19 Jul 2010 10:52:34 +0000 (14:52 +0400)
commit4a48a177caa2f44d63f079676e8ee36a223c3584
tree7af158cbed3d65d48f1dfd0944cb751fb59bdfec
parent4eebed92f87ff5319fd0a5e4d5c8feb30fcc98b6
parent2153bfcb7817b0c41855a72681ca6e285057722a
Merge branch 'master' of git@git.labs.intellij.net:idea/community