OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 24 May 2015 13:52:57 +0000 (22:52 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 24 May 2015 13:52:57 +0000 (22:52 +0900)
commitcc8dce0fe4dd8cb9fb4556dbdb9ad5a888240563
tree55d6084857b7bba230034b8886ad4ca87e8e55b0
parentd95f4d5e8787b4f9af665bc97497650210800293
parentee3b507e7f064f24e0a32b12e9f09a8c7c65b01e
Merge with stable