Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 4 Dec 2016 05:15:53 +0000 (14:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 4 Dec 2016 05:15:53 +0000 (14:15 +0900)

Trivial merge