Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 7 Oct 2011 07:49:58 +0000 (11:49 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 7 Oct 2011 07:49:58 +0000 (11:49 +0400)
commitfba091c48ee50ecf9b2c50ff9d82d3bad2f29b61
tree27467739eef7fe116e0b57b92698098ea19b3a5e
parent05e3ac4ef925c05394f6146034b3271e031a5ee9
parentf23f0b718f66231d5b6eda5b1ad4041eaef836af
Merge branch 'master' of git.labs.intellij.net:idea/community