Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 20 Oct 2010 13:27:54 +0000 (17:27 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 20 Oct 2010 13:27:54 +0000 (17:27 +0400)
commit308b8672c82f57886288c51540711fcc72f923d9
tree28a508f93f1745c5a3eb091a8b11822246abe2fd
parentaa3cc8bc5a3a11ef2560679ae9f9fcaee7cd72b3
parent3a6d36de1b7a336cc737e81565850d7f02face78
Merge branch 'master' of git.labs.intellij.net:idea/community