Merge commit 'fetch_head' into jpbeta

author Takuya Nishimoto <nishimotz@gmail.com>

Sun, 24 Jan 2016 10:44:43 +0000 (19:44 +0900)

committer Takuya Nishimoto <nishimotz@gmail.com>

Sun, 24 Jan 2016 10:44:43 +0000 (19:44 +0900)
author Takuya Nishimoto <nishimotz@gmail.com>
Sun, 24 Jan 2016 10:44:43 +0000 (19:44 +0900)
committer Takuya Nishimoto <nishimotz@gmail.com>
Sun, 24 Jan 2016 10:44:43 +0000 (19:44 +0900)
diff --cc source/globalCommands.py
Simple merge
diff --cc source/inputCore.py
Simple merge
author	Takuya Nishimoto <nishimotz@gmail.com>
	Sun, 24 Jan 2016 10:44:43 +0000 (19:44 +0900)
committer	Takuya Nishimoto <nishimotz@gmail.com>
	Sun, 24 Jan 2016 10:44:43 +0000 (19:44 +0900)
		1	2
source/globalCommands.py	patch \|	diff1 \|	diff2 \|	blob \| history
source/inputCore.py	patch \|	diff1 \|	diff2 \|	blob \| history