OSDN Git Service

resolved conflicts for merge of 456a2b86 to master