OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev