Merge remote-tracking branch 'pedroarnal-master/master'

Conflicts:
	lib/Resque.php

Author: Chris Boulton

lib/Resque.php

@@ -79,7 +79,13 @@ public static function redis()
 			self::$redis = new Resque_RedisCluster($server);
 		}
 		else {
-			list($host, $port) = explode(':', $server);
+			if (strpos($server, 'unix:') === false) {
+				list($host, $port) = explode(':', $server);
+			}
+			else {
+				$host = $server;
+				$port = null;
+			}
 			require_once dirname(__FILE__) . '/Resque/Redis.php';
 			self::$redis = new Resque_Redis($host, $port);
 		}

lib/Resque/Redis.php

@@ -39,7 +39,7 @@ class Resque_Redis extends Redisent
 		'setnx',
 		'incr',
 		'incrby',
-		'decrby',
+		'decr',
 		'decrby',
 		'rpush',
 		'lpush',