Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 17 Oct 2018 02:34:16 +0000 (11:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 17 Oct 2018 02:34:16 +0000 (11:34 +0900)

Trivial merge