Merge branch 'PY-10179' of https://github.com/Amarchuk/intellij-community into Amarch...

author Dmitry Trofimov <dmitry.trofimov@jetbrains.com>

Wed, 26 Feb 2014 13:00:33 +0000 (14:00 +0100)

committer Dmitry Trofimov <dmitry.trofimov@jetbrains.com>

Wed, 26 Feb 2014 13:00:33 +0000 (14:00 +0100)
author Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 26 Feb 2014 13:00:33 +0000 (14:00 +0100)
committer Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 26 Feb 2014 13:00:33 +0000 (14:00 +0100)
diff --cc python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java
Simple merge
diff --cc python/src/com/jetbrains/python/console/RunPythonConsoleAction.java
Simple merge
author	Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
	Wed, 26 Feb 2014 13:00:33 +0000 (14:00 +0100)
committer	Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
	Wed, 26 Feb 2014 13:00:33 +0000 (14:00 +0100)
		1	2
python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java	patch \|	diff1 \|	diff2 \|	blob \| history
python/src/com/jetbrains/python/console/RunPythonConsoleAction.java	patch \|	diff1 \|	diff2 \|	blob \| history