Merge remote branch 'pietern/brpoplpush'

author antirez <antirez@gmail.com>

Tue, 14 Dec 2010 15:26:37 +0000 (16:26 +0100)

committer antirez <antirez@gmail.com>

Tue, 14 Dec 2010 15:26:37 +0000 (16:26 +0100)
author antirez <antirez@gmail.com>
Tue, 14 Dec 2010 15:26:37 +0000 (16:26 +0100)
committer antirez <antirez@gmail.com>
Tue, 14 Dec 2010 15:26:37 +0000 (16:26 +0100)
diff --cc src/networking.c
Simple merge
diff --cc src/redis.h
Simple merge
diff --cc src/t_list.c
Simple merge
author	antirez <antirez@gmail.com>
	Tue, 14 Dec 2010 15:26:37 +0000 (16:26 +0100)
committer	antirez <antirez@gmail.com>
	Tue, 14 Dec 2010 15:26:37 +0000 (16:26 +0100)
		1	2
src/networking.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/redis.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/t_list.c	patch \|	diff1 \|	diff2 \|	blob \| history