OSDN Git Service

resolve merge conflicts of d043a840f7f12ce2c54e7d4564a6ac9cfa24dd17 to nyc-mr2-dev...