Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 11 Jan 2017 08:07:22 +0000 (17:07 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 11 Jan 2017 08:07:22 +0000 (17:07 +0900)
commite669429dd371d30fa85a823ed01a82e0f0a92df9
tree484fe751e0a163f03334fde0804def3af7fc2ea7
parent4dfd7bb9996c68c4933d0ebfc592b7c2655b157e
parent55ea06163ffbd01b095c915ba0d66d41b6b49735
Merge branch 'master' into single-inheritance.