2013-11-3 20:34:30
Merge branch 'master' of https://github.com/Yichou/common.git

Conflicts:
	src/com/yichou/common/utils/HttpUtils.java