]> git.saurik.com Git - redis.git/commitdiff
Merge remote-tracking branch 'origin/2.6' into 2.6
authorantirez <antirez@gmail.com>
Fri, 23 Mar 2012 19:20:13 +0000 (20:20 +0100)
committerantirez <antirez@gmail.com>
Fri, 23 Mar 2012 19:20:13 +0000 (20:20 +0100)

Trivial merge