Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 2 Aug 2010 08:44:58 +0000 (12:44 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 2 Aug 2010 08:44:58 +0000 (12:44 +0400)
commitf3f5622ad41680c0d317acdf7da9dac1688b07ee
tree0acfe8347f2badde20055745532d8ec01556786a
parentb0cf7baf9fd06823892cb0a5fd22ce3e88cb39a1
parent3260afabff22702902f9ea235b0406c8fb37df99
Merge branch 'master' of git.labs.intellij.net:idea/community