Merge branch 'master' of git.labs.intellij.net:idea/community
authorkirill.safonov <kirill.safonov@jetbrains.com>
Mon, 30 Jan 2012 15:36:37 +0000 (19:36 +0400)
committerkirill.safonov <kirill.safonov@jetbrains.com>
Mon, 30 Jan 2012 15:36:37 +0000 (19:36 +0400)
commit3b202d90b7c1e6483af057b8d4a542d39d58e983
tree5b41441ac7d55a41be0e5298fb19ed37ded8bb83
parentb715f17eccdc789e29732c1570185a46b7c6e7a1
parentae1b0f1a583cdc89e6ba07bb55684d7e42f3988f
Merge branch 'master' of git.labs.intellij.net:idea/community