Merge remote branch 'pietern/zfixes'

author antirez <antirez@gmail.com>

Thu, 24 Jun 2010 22:23:38 +0000 (00:23 +0200)

committer antirez <antirez@gmail.com>

Thu, 24 Jun 2010 22:23:38 +0000 (00:23 +0200)
author antirez <antirez@gmail.com>
Thu, 24 Jun 2010 22:23:38 +0000 (00:23 +0200)
committer antirez <antirez@gmail.com>
Thu, 24 Jun 2010 22:23:38 +0000 (00:23 +0200)
diff --cc redis.c
Simple merge
diff --cc tests/unit/type/list.tcl
Simple merge
author	antirez <antirez@gmail.com>
	Thu, 24 Jun 2010 22:23:38 +0000 (00:23 +0200)
committer	antirez <antirez@gmail.com>
	Thu, 24 Jun 2010 22:23:38 +0000 (00:23 +0200)
		1	2
redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/unit/type/list.tcl	patch \|	diff1 \|	diff2 \|	blob \| history