Merge pull request #644 from merk/patch-1

Add branch alias for 1.2

Author: ruflin

composer.json

@@ -31,5 +31,10 @@
             "Elastica": "lib/",
             "Elastica\\Test": "test/lib/"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.2.x-dev"
+        }
     }
 }