Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 16 Feb 2017 07:18:37 +0000 (16:18 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 16 Feb 2017 07:18:37 +0000 (16:18 +0900)
commitfb9ccc920f24493c09b81bac44a9a2b7f0c7c58a
tree5e189b561f565fb773d84940b0af6cc97d0164a8
parent1e786aac23e07f42a4873ccb72e8d1402023e218
parentae8b6404577b87ff5bdc704fd7692be8e2bd1d4a
Merge branch 'master' into single-inheritance.