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

Trivial merge