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

author antirez <antirez@gmail.com>

Wed, 17 Mar 2010 15:59:29 +0000 (16:59 +0100)

committer antirez <antirez@gmail.com>

Wed, 17 Mar 2010 15:59:29 +0000 (16:59 +0100)
author antirez <antirez@gmail.com>
Wed, 17 Mar 2010 15:59:29 +0000 (16:59 +0100)
committer antirez <antirez@gmail.com>
Wed, 17 Mar 2010 15:59:29 +0000 (16:59 +0100)
diff --cc redis.c
Simple merge
diff --cc test-redis.tcl
Simple merge
author	antirez <antirez@gmail.com>
	Wed, 17 Mar 2010 15:59:29 +0000 (16:59 +0100)
committer	antirez <antirez@gmail.com>
	Wed, 17 Mar 2010 15:59:29 +0000 (16:59 +0100)
		1	2
redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
test-redis.tcl	patch \|	diff1 \|	diff2 \|	blob \| history