Merge branch 'python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 12 Mar 2014 09:46:21 +0000 (13:46 +0400)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 12 Mar 2014 09:46:21 +0000 (13:46 +0400)
commit4afd85f67a8c7dd9bd7bf420cf58d21642e01f93
tree08322a72c8b22465ad60f5469c1afcdcc6baf576
parent88ed4755e113998bcaa592f248cafde5e175e07f
parent05289e4da0d7738a4a815f99153103d3b8142d8b
Merge branch 'python-fixes'

Conflicts:
python/src/com/jetbrains/python/inspections/quickfix/AddFunctionQuickFix.java
python/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java
python/src/com/jetbrains/python/inspections/PyRaisingNewStyleClassInspection.java
python/src/com/jetbrains/python/inspections/quickfix/AddFunctionQuickFix.java
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java