Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 4 Jan 2017 07:09:16 +0000 (16:09 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 4 Jan 2017 07:09:16 +0000 (16:09 +0900)
commita30eb85fae5ec9cb08e92de3b1d763a380e49431
tree98e5f98bde01a8ddbaad372ac7d6aebcc99336e3
parent106e3ae4a1f50ddab8e243ef3ce04136559f3697
parent7abf0ddeb17c29c601e3875b93ad2d59dcd6512e
Merge branch 'master' into single-inheritance.