Merge branch 'master' of git@git.labs.intellij.net:idea/community into tool-window
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 14 Jan 2010 11:08:20 +0000 (14:08 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 14 Jan 2010 11:08:20 +0000 (14:08 +0300)
commitd9ad19452587bac1f06b308a183e82e20467529b
tree11f6ff7a8b01e9354158036105ba7367a2630a93
parent66d06560d3c1b2e1193ddf17b8f431c687c18a55
parentf61bb47133cad97f9b483dafa8b53b8d388df01a
Merge branch 'master' of git@git.labs.intellij.net:idea/community into tool-window