OSDN Git Service

resolved conflicts for merge of cc634036 to master