BUG修复
Merge branch 'master' of https://github.com/expleeve/MulCCC

Conflicts:
	include/dedesql.class.php