Merge branch 'master' of git.labs.intellij.net:idea/community
commit64edee6638d27f0495278f7c0a81323d96e8c951
authorKirill.Safonov <kirill.safonov@swiftteams.com>
Fri, 15 Jan 2010 15:04:55 +0000 (15 18:04 +0300)
committerKirill.Safonov <kirill.safonov@swiftteams.com>
Fri, 15 Jan 2010 15:04:55 +0000 (15 18:04 +0300)
tree8e5a9f2871c276c53a0a039d74640d12130c3bd1
parentc9bb4a362f9d64094083802414d8698d479631bd
parent5e2388ed5dbcd42714f466693144037711ec8eb7
Merge branch 'master' of git.labs.intellij.net:idea/community