OSDN Git Service

resolved conflicts for merge of e85c304f to master