Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 8 Apr 2017 16:13:36 +0000 (01:13 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 8 Apr 2017 16:13:36 +0000 (01:13 +0900)

Trivial merge