Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 1 Mar 2017 16:17:33 +0000 (01:17 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 1 Mar 2017 16:17:33 +0000 (01:17 +0900)
commit8ca7b4063c9e4374c8eb4c6d9884d6b6be49287b
tree03968ff3cc1f6faeaee0962f588a3e09b3280585
parent56ad5aa0b9b7ceb42948246f6c500284a36fb8a5
parent80b958e78651aa5ff4da00dc4e8a9d54c5c15202
Merge branch 'master' into single-inheritance.