Merge remote-tracking branch 'remotes/origin/master' into upsource-master
authorEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Mon, 21 May 2012 12:36:34 +0000 (14:36 +0200)
committerEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Mon, 21 May 2012 12:36:34 +0000 (14:36 +0200)
commit7f9f78940051a1f53b1cdb98b5d5056da4a6619b
tree0510af7b91ee42ba0f7fde80f851dfd7c69524bd
parent2b2b5c826bc6528617c6469c802e061679710563
parentc57e93644c6e5f06b7c342a12114e4890f57fea8
Merge remote-tracking branch 'remotes/origin/master' into upsource-master
platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java