From: antirez <antirez@gmail.com>
Date: Fri, 23 Mar 2012 19:20:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/2.6' into 2.6
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/925927fc8f1b05624ffe76f8a98fc5c23088dd8c?ds=sidebyside

Merge remote-tracking branch 'origin/2.6' into 2.6
---

925927fc8f1b05624ffe76f8a98fc5c23088dd8c