Merge branch 'vlan/async-await'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Mon, 14 Sep 2015 08:58:35 +0000 (11:58 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Mon, 14 Sep 2015 08:58:35 +0000 (11:58 +0300)
1  2 
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java
python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
python/src/com/jetbrains/python/psi/types/PyTypeChecker.java

Simple merge