Jungtaek Lim 6efeb45952 Merge branch 'master' into introduce-new-sentinel-commands-added-to-Redis-2.8 ...

Conflicts:
	Makefile
	src/main/java/redis/clients/jedis/Jedis.java

2014-02-05 00:26:14 +09:00

..

java/redis/clients

Merge branch 'master' into introduce-new-sentinel-commands-added-to-Redis-2.8

2014-02-05 00:26:14 +09:00