Merge pull request #130 from stof/patch-1

Added an upper bound on the composer constraint

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "jms/metadata": ">=1.1.0"
+        "jms/metadata": ">=1.1.0,<1.3-dev"
     },
     "require-dev": {
         "symfony/framework-bundle": "2.*",
@@ -25,5 +25,10 @@
     "autoload": {
         "psr-0": { "JMS\\SerializerBundle": "" }
     },
-    "target-dir": "JMS/SerializerBundle"
+    "target-dir": "JMS/SerializerBundle",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
 }