OSDN Git Service

Merge branch '2.0' of https://scm.osdn.net/gitroot/dokopop/dokopop into 2.0
authortkhiro <tkhiro@git.osdn.net>
Fri, 25 Nov 2016 05:27:51 +0000 (14:27 +0900)
committertkhiro <tkhiro@git.osdn.net>
Fri, 25 Nov 2016 05:27:51 +0000 (14:27 +0900)

Trivial merge