q
e
i
Merge branch 'master' of https://github.com/XiaoEDaiKuan/xiao-e-dai-kuan-site-app.git
q
u
Merge branch 'master' of
https://github.com/XiaoEDaiKuan/xiao-e-dai-kuan-site-app.git

Conflicts:
	src/main/webapp/requestProduct.jsp
q
remove requestProductInfo.jsp
20130930
Merge branch 'master' of https://github.com/XiaoEDaiKuan/xiao-e-dai-kuan-site-app.git

Conflicts:
	src/main/webapp/requestProduct.jsp
Merge branch 'master' of https://github.com/XiaoEDaiKuan/xiao-e-dai-kuan-site-app.git
verifyCaptcha