Merge commit '299649c7f89ec4368a2f0cb9e7e0e0289f6f419c'
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 10 Sep 2018 11:55:03 +0000 (20:55 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 10 Sep 2018 11:55:03 +0000 (20:55 +0900)

Trivial merge