Merge remote-tracking branch 'antirez/2.6' into 2.6
ZADDCMPCAP/ZADDCMPCAPREV commands, this is a combination of ZADDCMP and ZADDCAP
Merge branch '2.6' into rdio-2.6
Roll new deb