Merge 'phansys/branch-alias' into old-pulls

Closes chrisboulton/php-resque#353

Author: danhunsaker

composer.json

@@ -47,5 +47,10 @@
 		"psr-0": {
 			"Resque": "lib"
 		}
-	}
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
+    }
 }