Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 27 Dec 2016 11:15:05 +0000 (20:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 27 Dec 2016 11:15:05 +0000 (20:15 +0900)
commitd3a3a225fa4f42c51e489dcb62c41be6aa063774
tree92973018ca3e0544ba6a6a9c89f4d6c9a1b8b996
parentae965cc2b7022e4fa67a8817f1ece2ceaed2564a
parentf673d741714f44e71c774efc96145da065c90ecc
Merge branch 'master' into single-inheritance.