Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 21 Mar 2017 07:27:31 +0000 (16:27 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 21 Mar 2017 07:27:31 +0000 (16:27 +0900)
commite2f5f73417b4df3f156f37e866518ddc9615ef0a
treea5ed2613e35d5e58529b484d143bfbe189be0e7e
parentb03d1404bbac7fd6f0b6703a7325a82b6e7ad6d2
parente13ef7ffdff9a061014816e74c877f6d11e691fb
Merge branch 'master' into single-inheritance.