Merge remote-tracking branch 'origin/master' into vlan/cond-resolve
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Fri, 29 Jan 2016 12:51:00 +0000 (15:51 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Fri, 29 Jan 2016 12:51:00 +0000 (15:51 +0300)
commite5313165e6378da246d9de31ef2fa7feaff8dad1
tree3cd9beb91805bef0ebd85abded41043506371e1b
parent40c9884a760d062a7bd44c81352a2b0ef91b8850
parent0c877c89fc038cc1d62922196c2e73160c5be990
Merge remote-tracking branch 'origin/master' into vlan/cond-resolve
python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCReferenceResolveProvider.java
python/educational-python/src/com/jetbrains/python/edu/PyEduUtils.java
python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyReferenceResolveProvider.java
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java
python/src/com/jetbrains/python/refactoring/introduce/field/PyIntroduceFieldHandler.java