OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 29 Nov 2015 12:55:52 +0000 (21:55 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 29 Nov 2015 12:55:52 +0000 (21:55 +0900)

Trivial merge