OSDN Git Service

resolved conflicts for merge of dd7dfafb to master