Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 25 Nov 2011 18:06:49 +0000 (21:06 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 25 Nov 2011 18:06:49 +0000 (21:06 +0300)
commit2fb8ab2a61195e48a5321677f58243ec22beae87
treec09f157abcaad9a80036b3affb0bc989ad5eedac
parentae56fcffd155ead728b709363a9e16f2b66a463b
parentbfc5e2d9d6bb63dfc1f478a9c6c05382abd33afc
Merge branch 'master' of git@git.labs.intellij.net:idea/community