]> git.saurik.com Git - redis.git/commitdiff
Merge branch 'unstable' into ttlres
authorantirez <antirez@gmail.com>
Tue, 8 Nov 2011 15:15:08 +0000 (16:15 +0100)
committerantirez <antirez@gmail.com>
Tue, 8 Nov 2011 15:15:08 +0000 (16:15 +0100)

Trivial merge