Merge branch 'maint'
authorYann Dirson <ydirson@free.fr>
Tue, 4 Feb 2014 23:51:09 +0000 (00:51 +0100)
committerYann Dirson <ydirson@free.fr>
Tue, 4 Feb 2014 23:51:09 +0000 (00:51 +0100)
commit35b5979113b95569469056e8ea9bf3f79a4ff279
treee03f55dc3fff5e04567d444bba39433b59730193
parent55186332c4e3dc366460c80b579c46ef444735a3
parentca6db121be811535ec9cd28a0fdcfe22c94a9b53
Merge branch 'maint'

Conflicts:
Makefile.in
NEWS
configure.ac
xshogi/parser.y
xshogi/scanner.l
Makefile.am
NEWS
configure.ac
doc/Makefile.am