Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 10 Jan 2017 10:55:33 +0000 (19:55 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 10 Jan 2017 10:55:33 +0000 (19:55 +0900)
commit4dfd7bb9996c68c4933d0ebfc592b7c2655b157e
treec84c828ed416a24237904cb07a1c5968d432ba5c
parent24e5305194cb9e365420308f29ddb62603aa3cdb
parentb666022e6ce35057e300ac1773770bec25b7bc44
Merge branch 'master' into single-inheritance.