Merge branch 'hmget' of git://github.com/pietern/redis

author antirez <antirez@gmail.com>

Tue, 13 Apr 2010 16:30:55 +0000 (18:30 +0200)

committer antirez <antirez@gmail.com>

Tue, 13 Apr 2010 16:30:55 +0000 (18:30 +0200)
author antirez <antirez@gmail.com>
Tue, 13 Apr 2010 16:30:55 +0000 (18:30 +0200)
committer antirez <antirez@gmail.com>
Tue, 13 Apr 2010 16:30:55 +0000 (18:30 +0200)
diff --cc redis.c
Simple merge
diff --cc test-redis.tcl
Simple merge
author	antirez <antirez@gmail.com>
	Tue, 13 Apr 2010 16:30:55 +0000 (18:30 +0200)
committer	antirez <antirez@gmail.com>
	Tue, 13 Apr 2010 16:30:55 +0000 (18:30 +0200)
		1	2
redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
test-redis.tcl	patch \|	diff1 \|	diff2 \|	blob \| history