move from googlecode
Merge branch 'master' of https://github.com/gougou851129/redis.cn

Conflicts:
	remove