Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 8 Apr 2017 16:13:36 +0000 (01:13 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 8 Apr 2017 16:13:36 +0000 (01:13 +0900)
commit9136ccf54956900669dc8f0ae9d749bb38a99209
tree5f1e3e89660c2f8052a67f669aa7024523462888
parent7ca63e3c3875f63420b83d7d8f4c34904ff2a96d
parentbcc4fc78e300808caf101c29a79f5549e779da5e
Merge branch 'master' into single-inheritance.