Merge branch 'master' of git.labs.intellij.net:idea/community
authorsweinreuter <sascha.weinreuter@gmail.com>
Thu, 5 Nov 2009 15:57:57 +0000 (16:57 +0100)
committersweinreuter <sascha.weinreuter@gmail.com>
Thu, 5 Nov 2009 15:57:57 +0000 (16:57 +0100)
commit60902d96e0250f6a5859394da6ecb8e47a3de8dc
tree5dc7e148b89a1b66beec1eb8dcc7a43957c3a75f
parent2462111ffa9b6b56d7ba59b43fa6ce5051d17f13
parent167d4aa6b79a5cfb960f0ec8cb023fbf39bc4b85
Merge branch 'master' of git.labs.intellij.net:idea/community