Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 13 Oct 2017 16:34:53 +0000 (01:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 13 Oct 2017 16:34:53 +0000 (01:34 +0900)

Trivial merge