Signed-off-by: Yate <e.yangting@gmail.com>
Merge branch 'master' of https://github.com/yangting/glivesvr.git

Conflicts:
	glives/src/glive/session/connmgr.go