Merge pull request #205 from alexander-schranz/patch-1

Update branch alias for master

Author: dantleech

composer.json

@@ -43,7 +43,7 @@
     "bin": ["bin/phpcrsh"],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.x-dev"
         }
     }
 }