Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 9 Dec 2016 11:41:26 +0000 (20:41 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 9 Dec 2016 11:41:26 +0000 (20:41 +0900)

Trivial merge