OSDN Git Service

resolved conflicts for merge of 7d3085c6 to master