Merge remote-tracking branch 'origin/PY-17356' into PY-17356 appcode/144.912 clion/144.906 dbe/144.904
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 6 Nov 2015 22:42:42 +0000 (01:42 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 6 Nov 2015 22:42:42 +0000 (01:42 +0300)
commitad37748c4642e1d1221c5e651c148c6bee0a9e10
tree68bc2bea0bdf1b8bd919882ad15357674ab73cc7
parent36ff3702d7a693ba14e2b7b2aa9ad41ef896c9a3
parent92a04e100068305513ab0dc0dd6f0db5976f9008
Merge remote-tracking branch 'origin/PY-17356' into PY-17356

# Conflicts:
# python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java
# python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java