OSDN Git Service

Merge branch 'master' of https://scm.osdn.net/gitroot/dokopop/dokopop
authornishikawat <takahiro.nishikawa@jp.sony.com>
Fri, 25 Nov 2016 02:38:44 +0000 (11:38 +0900)
committernishikawat <takahiro.nishikawa@jp.sony.com>
Fri, 25 Nov 2016 02:38:44 +0000 (11:38 +0900)

Trivial merge