2
Merge branch 'master' of https://github.com/hzgnjupt/python.git

Conflicts:
	study/hzg/study/pyside/foo.py