cc
Merge branch 'master' of https://github.com/chaocc/ooxx_happy

Conflicts:
	test_lzg