OSDN Git Service

Merge branch 'database-confusion' into 'master'