Merge branch 'master' into unstable

author antirez <antirez@gmail.com>

Tue, 4 Jan 2011 18:07:15 +0000 (19:07 +0100)

committer antirez <antirez@gmail.com>

Tue, 4 Jan 2011 18:07:15 +0000 (19:07 +0100)
author antirez <antirez@gmail.com>
Tue, 4 Jan 2011 18:07:15 +0000 (19:07 +0100)
committer antirez <antirez@gmail.com>
Tue, 4 Jan 2011 18:07:15 +0000 (19:07 +0100)
diff --cc src/Makefile
Simple merge
diff --cc src/redis.c
Simple merge
diff --cc src/t_string.c
Simple merge
author	antirez <antirez@gmail.com>
	Tue, 4 Jan 2011 18:07:15 +0000 (19:07 +0100)
committer	antirez <antirez@gmail.com>
	Tue, 4 Jan 2011 18:07:15 +0000 (19:07 +0100)
		1	2
src/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src/redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/t_string.c	patch \|	diff1 \|	diff2 \|	blob \| history