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/BinaryClient.java

@@ -1099,11 +1099,6 @@ public class BinaryClient extends Connection {
 	sendCommand(RESTORE, key, toByteArray(ttl), serializedValue);
     }
 
-    @Deprecated
-    public void pexpire(final byte[] key, final int milliseconds) {
-	pexpire(key, (long) milliseconds);
-    }
-
     public void pexpire(final byte[] key, final long milliseconds) {
 	sendCommand(PEXPIRE, key, toByteArray(milliseconds));
     }