Merge branch 'master' of git@git.labs.intellij.net:idea/community
commitc123b9d037c681b744ab55827750e90cbd604aa5
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 14 Jan 2010 12:44:40 +0000 (14 15:44 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 14 Jan 2010 12:44:40 +0000 (14 15:44 +0300)
tree1fa7bc59ca23b76a70cd205a13170b01be3d0c47
parent1166005a8644d409511e12c564f9efd3d013d2b3
parent75c5bd05c8796895ccf4e7a6ac6beef63349c593
Merge branch 'master' of git@git.labs.intellij.net:idea/community