Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Wed, 25 Feb 2015 12:01:13 +0000 (15:01 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Wed, 25 Feb 2015 12:01:13 +0000 (15:01 +0300)
commita8fa207fafb1aa80c82224f671d0ba1600af7c65
treee4b28cae4767eb03c3e83f27da86dea5b770c5f4
parent5448d692c149ae63d5a82a30dc0e6eb951884dba
parent28fbdbdfa6f287fd0f846e450499e58776b83feb
Merge remote-tracking branch 'origin/master'
python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java