OSDN Git Service

resolved conflicts for merge of c2c64a31 to master