Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Wed, 12 Jan 2011 17:56:10 +0000 (18:56 +0100)
committerDmitry Jemerov <yole@jetbrains.com>
Wed, 12 Jan 2011 17:56:10 +0000 (18:56 +0100)
commit333b9377bcb13bad7a228c010412563c08529d86
tree8ba5bab2664d6931458022962d6c7521880bcfc7
parentbc149eda784b8db47fe65fa02c49f96e24e14158
parent64d18de9adfc768238345299074273bfe45481f4
Merge branch 'master' of git.labs.intellij.net:idea/community