OSDN Git Service

resolved conflicts for merge of 5e610d6a to master