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)
# Conflicts:
# python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java
# python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java


Trivial merge