00
Merge branch '2014122401' of https://github.com/zhoufeng001/Live.git
into 2014122401

Conflicts:
	live/redis-windows/dump.rdb
0