Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 24 Feb 2017 16:09:14 +0000 (01:09 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 24 Feb 2017 16:09:14 +0000 (01:09 +0900)
commit3ba5c2da29e23d94bcca7ab6a7182dcbbeb07a2b
tree2a4114691b95b3e3cde3f9a0970a7e1dddec5e1f
parent2470150c5f46be4f3d91da6f415185be3c69d255
parent8cfbbd2f0fa4ca3a515bd3b5927ef8d7e65e5fdd
Merge branch 'master' into single-inheritance.