]> git.saurik.com Git - redis.git/commitdiff
Merge branch 'smallkeys' of github.com:antirez/redis into smallkeys
authorantirez <antirez@gmail.com>
Tue, 1 Jun 2010 12:18:38 +0000 (14:18 +0200)
committerantirez <antirez@gmail.com>
Tue, 1 Jun 2010 12:18:38 +0000 (14:18 +0200)
1  2 
redis.c

diff --cc redis.c
Simple merge