Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 15 Dec 2016 10:15:36 +0000 (19:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 15 Dec 2016 10:15:36 +0000 (19:15 +0900)

Trivial merge