Merge remote branch 'pietern/unstable-zset' into unstable

author antirez <antirez@gmail.com>

Thu, 14 Apr 2011 11:31:14 +0000 (13:31 +0200)

committer antirez <antirez@gmail.com>

Thu, 14 Apr 2011 11:31:14 +0000 (13:31 +0200)
author antirez <antirez@gmail.com>
Thu, 14 Apr 2011 11:31:14 +0000 (13:31 +0200)
committer antirez <antirez@gmail.com>
Thu, 14 Apr 2011 11:31:14 +0000 (13:31 +0200)
diff --cc src/config.c
Simple merge
diff --cc src/redis.c
Simple merge
diff --cc src/redis.h
Simple merge
author	antirez <antirez@gmail.com>
	Thu, 14 Apr 2011 11:31:14 +0000 (13:31 +0200)
committer	antirez <antirez@gmail.com>
	Thu, 14 Apr 2011 11:31:14 +0000 (13:31 +0200)
		1	2
src/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/redis.h	patch \|	diff1 \|	diff2 \|	blob \| history