OSDN Git Service

resolved conflicts for merge of 56791ebe to master