Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 4 Dec 2016 05:15:53 +0000 (14:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 4 Dec 2016 05:15:53 +0000 (14:15 +0900)
commit76674de04e9f1ae0c4fcb74758bb5225c1455dfd
tree945c450207d53caadd607b1fab4a42b9ad04d011
parent98e3cf4601b6c8d3405b70f2cc3aafdbf8c3aa8f
parent87dee9d03c9e8d9388d23d4abb607a82a4d97b7b
Merge branch 'master' into single-inheritance.