Merge branch 'remove-pexpire-int' of https://github.com/aniketschneider/jedis into aniketschneider-remove-pexpire-int

Conflicts:
	src/main/java/redis/clients/jedis/Client.java

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

@@ -3117,11 +3117,6 @@ public class Jedis extends BinaryJedis implements JedisCommands,
 	return client.getStatusCodeReply();
     }
 
-    @Deprecated
-    public Long pexpire(final String key, final int milliseconds) {
-	return pexpire(key, (long) milliseconds);
-    }
-
     public Long pexpire(final String key, final long milliseconds) {
 	checkIsInMulti();
 	client.pexpire(key, milliseconds);