From: antirez <antirez@gmail.com>
Date: Thu, 11 Oct 2012 16:36:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/2.6' into 2.6
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/c3ff470889c2bcf4d9521cf547d32760ef5bbc6c

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

c3ff470889c2bcf4d9521cf547d32760ef5bbc6c