]> git.saurik.com Git - redis.git/commitdiff
Merge remote branch 'pietern/unstable-replnonblock' into unstable
authorantirez <antirez@gmail.com>
Sun, 29 May 2011 12:26:01 +0000 (14:26 +0200)
committerantirez <antirez@gmail.com>
Sun, 29 May 2011 12:26:01 +0000 (14:26 +0200)

Trivial merge