Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 20 May 2017 17:27:38 +0000 (02:27 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 20 May 2017 17:27:38 +0000 (02:27 +0900)
commit894e2d086e2b66ed1d36dfd82e66f78385476984
tree808a38533c53e62c83ee3449c16e5bfc32dae5be
parent6433c8eeac2f489b0104f53d4468d30f3746f10b
parentf7f116383dc070f539e85e2dd61ace39130b272b
Merge branch 'master' into single-inheritance.