Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 21 May 2017 07:24:43 +0000 (16:24 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 21 May 2017 07:24:43 +0000 (16:24 +0900)
commitc8666380e861f1654e799c9ca70e2bcfb2c8a35c
treeaf05e6b0fdc0e8643980b8dd2f756702a93b5a95
parent894e2d086e2b66ed1d36dfd82e66f78385476984
parent782e35ecf453503369250dc70cf279b7ac20ac79
Merge branch 'master' into single-inheritance.