Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 8 Jan 2017 16:41:20 +0000 (01:41 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 8 Jan 2017 16:41:20 +0000 (01:41 +0900)
commitebbbc58fb5a2d85f34837138ab6691dd17d36341
tree3f819d93d5929cfb8e604a4dfc5cae7618328991
parent17465e6bdbadfa025fb7b67d558d9acfbb6911ca
parent340f00a75b4eb22aed3c612cb9661c441c519039
Merge branch 'master' into single-inheritance.