From: antirez <antirez@gmail.com>
Date: Fri, 16 Sep 2011 10:36:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/unstable' into bg-aof-2
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/af4707a80c8ff5bbca34e271d3b33fd23135c203?ds=sidebyside;hp=--cc

Merge remote-tracking branch 'origin/unstable' into bg-aof-2
---

af4707a80c8ff5bbca34e271d3b33fd23135c203