OSDN Git Service

Merge branch 'master' into wdoor-stable 20151213
authorDaigo Moriwaki <daigo@debian.org>
Sun, 13 Dec 2015 12:28:20 +0000 (21:28 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sun, 13 Dec 2015 12:28:20 +0000 (21:28 +0900)
commita0947c435b603ae1fa2371870217b6b6217e1cc6
tree0d8e3e50f05c850fe225f56c0fdf57ae18f1ff00
parentc363dd32f38189ade222b5cc730f830e6734c7c2
parent0c29075831321d9f0beaa4974031711032360273
Merge branch 'master' into wdoor-stable

Conflicts:
shogi_server.rb
changelog