Merge branch 'transaction-block-should-not-call-discard-when-exception-ocurred' of github.com:HeartSaVioR/jedis into HeartSaVioR-transaction-block-should-not-call-discard-when-exception-ocurred

Conflicts:
	src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java

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

@@ -1699,13 +1699,9 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
     public List<Object> multi(final TransactionBlock jedisTransaction) {
 	List<Object> results = null;
 	jedisTransaction.setClient(client);
-	try {
-	    client.multi();
-	    jedisTransaction.execute();
-	    results = jedisTransaction.exec();
-	} catch (Exception ex) {
-	    jedisTransaction.discard();
-	}
+    client.multi();
+    jedisTransaction.execute();
+    results = jedisTransaction.exec();
 	return results;
     }