Merge branch 'master' into unstable

This commit is contained in:
antirez
2011-01-04 19:07:15 +01:00
23 changed files with 802 additions and 323 deletions

View File

@ -1,4 +1,3 @@
#include <limits.h>
#include "redis.h"
/*-----------------------------------------------------------------------------