Merge remote branch 'pietern/zset-mem'

author antirez <antirez@gmail.com>

Wed, 22 Sep 2010 14:09:33 +0000 (16:09 +0200)

committer antirez <antirez@gmail.com>

Wed, 22 Sep 2010 14:09:33 +0000 (16:09 +0200)
author antirez <antirez@gmail.com>
Wed, 22 Sep 2010 14:09:33 +0000 (16:09 +0200)
committer antirez <antirez@gmail.com>
Wed, 22 Sep 2010 14:09:33 +0000 (16:09 +0200)
diff --cc src/redis.c
Simple merge
diff --cc src/redis.h
Simple merge
diff --cc src/t_zset.c
Simple merge
author	antirez <antirez@gmail.com>
	Wed, 22 Sep 2010 14:09:33 +0000 (16:09 +0200)
committer	antirez <antirez@gmail.com>
	Wed, 22 Sep 2010 14:09:33 +0000 (16:09 +0200)
		1	2
src/redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/redis.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/t_zset.c	patch \|	diff1 \|	diff2 \|	blob \| history