Merge git://github.com/dierbro/redis

author antirez <antirez@gmail.com>

Sat, 6 Jun 2009 21:40:48 +0000 (23:40 +0200)

committer antirez <antirez@gmail.com>

Sat, 6 Jun 2009 21:40:48 +0000 (23:40 +0200)
author antirez <antirez@gmail.com>
Sat, 6 Jun 2009 21:40:48 +0000 (23:40 +0200)
committer antirez <antirez@gmail.com>
Sat, 6 Jun 2009 21:40:48 +0000 (23:40 +0200)
diff --cc Makefile
Simple merge
diff --cc redis.c
Simple merge
author	antirez <antirez@gmail.com>
	Sat, 6 Jun 2009 21:40:48 +0000 (23:40 +0200)
committer	antirez <antirez@gmail.com>
	Sat, 6 Jun 2009 21:40:48 +0000 (23:40 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
redis.c	patch \|	diff1 \|	diff2 \|	blob \| history