Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 2 Dec 2010 18:36:14 +0000 (21:36 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 2 Dec 2010 18:36:14 +0000 (21:36 +0300)
commitd148f1bc047331cf2b26a05568fd5f4306993e87
tree1c4027859ae6fdc327dc1e73db01505a4f9b1879
parent2a80e6bde3b4ebd7d9edaad7e8c9d3ee4cf370d3
parent03b1d688001e5df4e4075456cc8238e8ac91e463
Merge branch 'master' of git.labs.intellij.net:idea/community