Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Feb 2017 17:08:02 +0000 (02:08 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Feb 2017 17:08:02 +0000 (02:08 +0900)
commitf3271af0e1ebc86a536dbde5d8bcc3e51218ea20
tree9e6fec267f06e7ba0c87e3e26ccfe863e225c099
parentc60b3d543c7685ed1accb1ab633a7c09fec05dbd
parent956155fd91197211b4e4b670f3e59dd787670969
Merge branch 'master' into single-inheritance.