Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 27 Feb 2017 15:21:36 +0000 (00:21 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 27 Feb 2017 15:21:36 +0000 (00:21 +0900)
commit27db2b4953e6df7190d7eb5e4cc91a90da286cd1
treef0c299afbf159a9e265e6c3354935b9bc1e64f5c
parent44eecc85f3edd6b671e6bd4915aad6b60255fb2e
parentffeb2490666c8a9da3ee438cde36a963eb2923ef
Merge branch 'master' into single-inheritance.