OSDN Git Service

Merge branch 'master' of github.com:magic3org/magic3
authornaoki hirata <naoki@magic3.org>
Sun, 29 May 2016 01:00:35 +0000 (10:00 +0900)
committernaoki hirata <naoki@magic3.org>
Sun, 29 May 2016 01:00:35 +0000 (10:00 +0900)

Trivial merge