From: Daigo Moriwaki <daigo@debian.org>
Date: Sun, 13 Dec 2015 12:28:20 +0000 (+0900)
Subject: Merge branch 'master' into wdoor-stable
X-Git-Tag: 20170902~13^2
X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=commitdiff_plain;h=a0947c435b603ae1fa2371870217b6b6217e1cc6

Merge branch 'master' into wdoor-stable

Conflicts:
	shogi_server.rb
---

a0947c435b603ae1fa2371870217b6b6217e1cc6