Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 9 Dec 2016 11:41:26 +0000 (20:41 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 9 Dec 2016 11:41:26 +0000 (20:41 +0900)
commit68c8b61acf9658d7c76b50e8973e0025e8e23dd8
treeb8b0ed2ba9a21c900d297e84953f1ceaf6ea39dd
parent68c3ae408f3af5f940a91b8a7d644ecc817b28e6
parent3f1f6c36477f0ae1b977ee2a6c233a748fdf5905
Merge branch 'master' into single-inheritance.