deleted:    myarcadeblog/changelog.txt
Merge branch 'master' of https://github.com/glayyiyi/cms

Conflicts:
	1/wp-content/plugins/woocommerce/includes/class-wc-form-handler.php

	modified:   woocommerce/i18n/languages/woocommerce-zh_CN.po