Merge branch 'unstable' into incrbyfloat

author antirez <antirez@gmail.com>

Mon, 14 Nov 2011 14:59:56 +0000 (15:59 +0100)

committer antirez <antirez@gmail.com>

Mon, 14 Nov 2011 14:59:56 +0000 (15:59 +0100)
author antirez <antirez@gmail.com>
Mon, 14 Nov 2011 14:59:56 +0000 (15:59 +0100)
committer antirez <antirez@gmail.com>
Mon, 14 Nov 2011 14:59:56 +0000 (15:59 +0100)
diff --cc src/redis.c
Simple merge
diff --cc src/redis.h
Simple merge
author	antirez <antirez@gmail.com>
	Mon, 14 Nov 2011 14:59:56 +0000 (15:59 +0100)
committer	antirez <antirez@gmail.com>
	Mon, 14 Nov 2011 14:59:56 +0000 (15:59 +0100)
		1	2
src/redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/redis.h	patch \|	diff1 \|	diff2 \|	blob \| history