OSDN Git Service

resolved conflicts for merge of 6c82fe07 to master