Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 12 Feb 2017 07:16:10 +0000 (16:16 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 12 Feb 2017 07:16:10 +0000 (16:16 +0900)
commit05c36d540103d0247894e532696d093533682e80
tree2f741cb8e4c1998ca4c349df5392e2cb09243a18
parent6bf6baa8e3d5e815dd211e8b82a939916d8b06f4
parent678013ece2abb7a24174d5e06e67d432e93566e4
Merge branch 'master' into single-inheritance.