Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 28 Feb 2017 09:05:31 +0000 (18:05 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 28 Feb 2017 09:05:31 +0000 (18:05 +0900)
commit0bed342875fa9065597fc4810eba882d7c8bd008
tree78fbaffd38cb1250cd7e9ad0f1418e2813ec9139
parent83022c3604629ab7a653a0314caa98f9d5c20ea2
parent0efddf1dca7865a542f22073f070f0f436cd5de3
Merge branch 'master' into single-inheritance.