Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 24 Apr 2018 07:01:15 +0000 (16:01 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 24 Apr 2018 07:01:15 +0000 (16:01 +0900)

Trivial merge