Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 20 Jan 2017 17:31:17 +0000 (02:31 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 20 Jan 2017 17:31:17 +0000 (02:31 +0900)

Trivial merge