OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Thu, 27 Nov 2014 11:20:26 +0000 (20:20 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Thu, 27 Nov 2014 11:20:26 +0000 (20:20 +0900)

Trivial merge