Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 18 May 2017 12:31:28 +0000 (21:31 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 18 May 2017 12:31:28 +0000 (21:31 +0900)
commit3a4d731de2cd855950ede3f42c086a23a01990f6
tree3ac54584023a3979fcfbed73fcce3e5e71aa2344
parentcaae467f43e9bc8ed089186429a401e5edc35644
parent354b41b34db32abef5bc61015f7eb40cc1fa48b9
Merge branch 'master' into single-inheritance.