Merge branch 'master' of git.labs.intellij.net:idea/community
commit224831bab11a6dd05a59e0ec44c10202ff976437
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 18 Dec 2009 13:20:22 +0000 (18 16:20 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 18 Dec 2009 13:20:22 +0000 (18 16:20 +0300)
tree9257de9a3e3ac6e248e0da125b67ead256d59f67
parentb10a0d0326d99aefd8d7975f09eceabb9619999d
parent2d0179918b2e918272e97ad17cde28cc900c8e55
Merge branch 'master' of git.labs.intellij.net:idea/community