deleted:    log/gate.log
	deleted:    log/mysql_test.erl
	modified:   src/db_modules/model_role_han_grave_db.erl
	modified:   src/mysql_code_gen/mysql_module_gen.erl
	modified:   src/mysql_module/mysql/mysql_client.erl
Merge branch 'master' of https://github.com/EricYT/zhougame

Conflicts:
	log/gate.log
	log/mysql_test.erl
	.git/MERGE_HEAD

	new file:   log/gate.log
	new file:   log/mysql_test.erl