Merge branch 'variadic' of git://github.com/ivowiblo/jedis into variadic

Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Commands.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java

src/main/java/redis/clients/jedis/Commands.java

@@ -76,7 +76,7 @@ public interface Commands {
 
     public void hexists(final String key, final String field);
 
-    public void hdel(final String key, final String field);
+    public void hdel(final String key, final String... fields);
 
     public void hlen(final String key);
 
@@ -86,9 +86,9 @@ public interface Commands {
 
     public void hgetAll(final String key);
 
-    public void rpush(final String key, final String... string);
+    public void rpush(final String key, final String... strings);
 
-    public void lpush(final String key, final String... string);
+    public void lpush(final String key, final String... strings);
 
     public void llen(final String key);
 
@@ -108,16 +108,16 @@ public interface Commands {
 
     public void rpoplpush(final String srckey, final String dstkey);
 
-    public void sadd(final String key, final String member);
+    public void sadd(final String key, final String... members);
 
     public void smembers(final String key);
 
-    public void srem(final String key, final String member);
+    public void srem(final String key, final String... member);
 
     public void spop(final String key);
 
     public void smove(final String srckey, final String dstkey,
-            final String member);
+	    final String member);
 
     public void scard(final String key);
 
@@ -139,12 +139,14 @@ public interface Commands {
 
     public void zadd(final String key, final double score, final String member);
 
+    public void zadd(final String key, final Map<Double, String> scoreMembers);
+
     public void zrange(final String key, final int start, final int end);
 
-    public void zrem(final String key, final String member);
+    public void zrem(final String key, final String... members);
 
     public void zincrby(final String key, final double score,
-            final String member);
+	    final String member);
 
     public void zrank(final String key, final String member);
 
@@ -153,10 +155,10 @@ public interface Commands {
     public void zrevrange(final String key, final int start, final int end);
 
     public void zrangeWithScores(final String key, final int start,
-            final int end);
+	    final int end);
 
     public void zrevrangeWithScores(final String key, final int start,
-            final int end);
+	    final int end);
 
     public void zcard(final String key);
 
@@ -171,61 +173,61 @@ public interface Commands {
     public void blpop(final String[] args);
 
     public void sort(final String key, final SortingParams sortingParameters,
-            final String dstkey);
+	    final String dstkey);
 
     public void sort(final String key, final String dstkey);
 
     public void brpop(final String[] args);
 
     public void brpoplpush(final String source, final String destination,
-            final int timeout);
+	    final int timeout);
 
     public void zcount(final String key, final double min, final double max);
 
     public void zrangeByScore(final String key, final double min,
-            final double max);
+	    final double max);
 
     public void zrangeByScore(final String key, final String min,
-            final String max);
+	    final String max);
 
     public void zrangeByScore(final String key, final double min,
-            final double max, final int offset, int count);
+	    final double max, final int offset, int count);
 
     public void zrangeByScoreWithScores(final String key, final double min,
-            final double max);
+	    final double max);
 
     public void zrangeByScoreWithScores(final String key, final double min,
-            final double max, final int offset, final int count);
+	    final double max, final int offset, final int count);
 
     public void zrevrangeByScore(final String key, final double max,
-            final double min);
+	    final double min);
 
     public void zrevrangeByScore(final String key, final String max,
-            final String min);
+	    final String min);
 
     public void zrevrangeByScore(final String key, final double max,
-            final double min, final int offset, int count);
+	    final double min, final int offset, int count);
 
     public void zrevrangeByScoreWithScores(final String key, final double max,
-            final double min);
+	    final double min);
 
     public void zrevrangeByScoreWithScores(final String key, final double max,
-            final double min, final int offset, final int count);
+	    final double min, final int offset, final int count);
 
     public void zremrangeByRank(final String key, final int start, final int end);
 
     public void zremrangeByScore(final String key, final double start,
-            final double end);
+	    final double end);
 
     public void zunionstore(final String dstkey, final String... sets);
 
     public void zunionstore(final String dstkey, final ZParams params,
-            final String... sets);
+	    final String... sets);
 
     public void zinterstore(final String dstkey, final String... sets);
 
     public void zinterstore(final String dstkey, final ZParams params,
-            final String... sets);
+	    final String... sets);
 
     public void strlen(final String key);
 
@@ -238,7 +240,7 @@ public interface Commands {
     public void echo(final String string);
 
     public void linsert(final String key, final LIST_POSITION where,
-            final String pivot, final String value);
+	    final String pivot, final String value);
 
     public void bgrewriteaof();