Merge branch 'master' of D:\htdocs\git\his with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	changelog.txt
Merge remote-tracking branch 'origin/master'
update sửa thanh toán