OSDN Git Service

resolved conflicts for merge of a08c8a5f to master