OSDN Git Service

resolved conflicts for merge of 2e75e47d to master