OSDN Git Service

Merge branch 'master' into workSpace
authorKillery <Killery@kiritani-no-Mac-mini.local>
Tue, 1 Mar 2016 17:34:44 +0000 (02:34 +0900)
committerKillery <Killery@kiritani-no-Mac-mini.local>
Tue, 1 Mar 2016 17:34:44 +0000 (02:34 +0900)

Trivial merge