2 Commits

Author	SHA1	Message	Date
Jonathan Leibiusky	ad149e8252	Remove @override to make it java 1.5 compliant	2010-11-22 10:21:56 -03:00
Jonathan Leibiusky	b013a74c44	Merge branch 'binaryAPI' of git://github.com/yaourt/jedis ... Conflicts: src/main/java/redis/clients/jedis/Connection.java src/main/java/redis/clients/jedis/Jedis.java src/main/java/redis/clients/jedis/ShardedJedis.java	2010-11-15 23:55:57 -03:00