Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Mon, 18 Jan 2010 17:26:42 +0000 (20:26 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Mon, 18 Jan 2010 17:26:42 +0000 (20:26 +0300)
commit5ff10ec3026a2a5f364f2d44ec687803334d839b
tree6e8abf5ecae8bfd34b4b17e082193d5d7acd13b4
parent34260b0cad847866f09e0ae7d07f5e0976c0ba75
parentc93fa74893b8a3f05127e0b3e0394916375bac96
Merge branch 'master' of git.labs.intellij.net:idea/community