Merge branch 'master' of git@git.labs.intellij.net:idea/community
commitd95a9f17457ecb8211c35f18c888c6ed90d30846
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 29 Jan 2010 13:17:09 +0000 (29 16:17 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 29 Jan 2010 13:17:09 +0000 (29 16:17 +0300)
treea3befa3f6b3c2a92556f3e15f8822ed685087d2c
parentd627c88fe87f879ab702e86023aac5274a96d3e7
parent8b1ce6ef4faeede5645c834c6918ceae35530750
Merge branch 'master' of git@git.labs.intellij.net:idea/community