]> git.saurik.com Git - redis.git/commitdiff
Merge branch 'integration' of git://github.com/pietern/redis
authorantirez <antirez@gmail.com>
Fri, 14 May 2010 22:38:16 +0000 (00:38 +0200)
committerantirez <antirez@gmail.com>
Fri, 14 May 2010 22:38:16 +0000 (00:38 +0200)

Trivial merge