Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 3 Jun 2017 12:05:23 +0000 (21:05 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 3 Jun 2017 12:05:23 +0000 (21:05 +0900)
commit1a1c605a2e2811cd9256dd790eb8ecd689db6ac0
tree1d255a90c2d33212f07cae4e9070d9e3decc556e
parent80e3c08c37a821e6b80a571770e361af92a3f951
parentf0385eb9b93c8ee6765c902428629d8e19a78f2e
Merge branch 'master' into single-inheritance.