OSDN Git Service

merged 3.2 original code