OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 21 Jun 2015 15:50:01 +0000 (00:50 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 21 Jun 2015 15:50:01 +0000 (00:50 +0900)

Trivial merge