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)
commit1ed464db8a0d2ce1c849f89551257841e7d6ee8f
treee0de2081b3e0d164650e3b5a1e828e3cddefc729
parentdc8086c0eb94e809cba4e98845680dcce1294e5b
parent24226c09fe6a3cf216b18a4a3ffbeaa7673cdfa6
Merge branch 'master' into single-inheritance.