OSDN Git Service

Merge branch 'master' into maven
authorseraphy <seraphy@users.osdn.me>
Sat, 24 Feb 2018 19:07:26 +0000 (04:07 +0900)
committerseraphy <seraphy@users.osdn.me>
Sat, 24 Feb 2018 19:07:26 +0000 (04:07 +0900)

Trivial merge