Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 31 Mar 2019 15:28:32 +0000 (00:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 31 Mar 2019 15:28:32 +0000 (00:28 +0900)

Trivial merge