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

@@ -780,11 +780,6 @@ public class Client extends BinaryClient implements Commands {
 	restore(SafeEncoder.encode(key), ttl, serializedValue);
     }
 
-    @Deprecated
-    public void pexpire(final String key, final int milliseconds) {
-	pexpire(key, (long) milliseconds);
-    }
-    
     public void pexpire(final String key, final long milliseconds) {
 	pexpire(SafeEncoder.encode(key), milliseconds);
     }