Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 20 Jan 2017 17:31:17 +0000 (02:31 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 20 Jan 2017 17:31:17 +0000 (02:31 +0900)
commit81ffd6076f54d9f4066934faf4fb3307b3b3b8c7
tree9363df81430afedbdad0d910f69538decfcc8da6
parent34a904705b83b0d980817e08250b751afcd94521
parentb89514ca1a622ae7d85b0ea120b0c0893e3876cb
Merge branch 'master' into single-inheritance.