Merge branch 'master' of git@git.labs.intellij.net:idea/community idea/96.432
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 21 Jun 2010 06:12:01 +0000 (10:12 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 21 Jun 2010 06:12:01 +0000 (10:12 +0400)
commit261918695f4e3e965b6f34fc5f952d1217c42354
tree3b5a04fa051d08d4f0329b09cfeb83618f29f2f2
parentfa6cbf8e0e9e8230f14e8d0ecfa7f5a173c36d36
parenta1c3651c8f1760f663b7206f373027a83abcc3de
Merge branch 'master' of git@git.labs.intellij.net:idea/community