Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 3 Apr 2017 14:40:11 +0000 (23:40 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 3 Apr 2017 14:40:11 +0000 (23:40 +0900)
commit010a61c2ff1564846084d24ede3c23bc2752e989
treedff4ea85f5f626bdd127363a6a19607f07aa4efa
parent7f20a354c063928a0fd4a253ead8350426779fbe
parent7daf6d6295a646de83538c3f91854605001d4e1b
Merge branch 'master' into single-inheritance.