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

This commit is contained in:
antirez 2012-04-01 10:15:07 +02:00
commit 2281f90c9b