Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 18 Jan 2010 11:51:28 +0000 (14:51 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 18 Jan 2010 11:51:28 +0000 (14:51 +0300)
commita96068ad6e0d9e6913cc26678966459930af5fe8
treeae9db45a04a35cf04fd9294f97eab0d7ca7110d7
parent4cee7e44a155f406061db266e65becf0b73d34a2
parentbfa671478edbbd7e14ba49a7424602881fac4f9c
Merge branch 'master' of git@git.labs.intellij.net:idea/community

Conflicts:
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java

Conflicts:
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java