Merge branch 'master' into vlan/pyi
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Tue, 18 Aug 2015 19:09:34 +0000 (22:09 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Tue, 18 Aug 2015 19:09:34 +0000 (22:09 +0300)
commitbb60e51b50d4b07db1c9eb5465261865f80641fb
tree13a3d4d5a02d3c837644a431dc3fa00f630a5ad9
parent55e3ac1dc3549208cb0cde55243b9effa0bec562
parent8828d7cee48f8b26c97cd7d1363cbde97980e591
Merge branch 'master' into vlan/pyi

Conflicts:
python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java
python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java
python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
python/src/com/jetbrains/python/psi/types/PyTypeChecker.java