Merge branch 'master' of github.com:antirez/redis

diff --cc src/redis.c
Simple merge

diff --cc src/redis.h
index 6e2112a0d51065ca4c51e7e806e3f1e66884ef87,860e77a18f40be8dcf718a4eb57b37397039ede8..4a6af106b92b3a4168b2a09062a1bcc0c09d35de
--- 1/src/redis.h
--- 2/src/redis.h
+++ b/src/redis.h
@@@ -970,7 -973,9 +977,8 @@@ void execCommand(redisClient *c)
  void discardCommand(redisClient *c);
  void blpopCommand(redisClient *c);
  void brpopCommand(redisClient *c);
+ void brpoplpushCommand(redisClient *c);
  void appendCommand(redisClient *c);
 -void substrCommand(redisClient *c);
  void strlenCommand(redisClient *c);
  void zrankCommand(redisClient *c);
  void zrevrankCommand(redisClient *c);