Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 6 Dec 2016 18:00:00 +0000 (03:00 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 6 Dec 2016 18:00:00 +0000 (03:00 +0900)
commit99338affacec28604889e721b51a77a0c175fdc5
tree148ad503e3e72ce49a932cca805f75ddacc6574e
parenta0d46069d747e103bf3b88935b67e7014aaa042f
parent1a0ea7daf4beb05dad8f27f4c6b19074822e2d31
Merge branch 'master' into single-inheritance.