From fac5bed8f9bc7b0648d196d4012cd8bd26840b42 Mon Sep 17 00:00:00 2001
From: William DURAND <william.durand1@gmail.com>
Date: Wed, 19 Feb 2014 17:04:12 +0100
Subject: [PATCH] Prepare 1.1.0 release

---
 composer.json | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 31e4866..5fdb251 100644
--- a/composer.json
+++ b/composer.json
@@ -1,21 +1,26 @@
 {
-  "name": "willdurand/faker-bundle",
-  "description": "Put the awesome Faker lib into the DIC and populate your database with fake data.",
-  "keywords": ["faker", "fixtures", "data"],
-  "type": "symfony-bundle",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "William Durand",
-      "email": "william.durand1@gmail.com"
+    "name": "willdurand/faker-bundle",
+    "description": "Put the awesome Faker lib into the DIC and populate your database with fake data.",
+    "keywords": ["faker", "fixtures", "data"],
+    "type": "symfony-bundle",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "William Durand",
+            "email": "william.durand1@gmail.com"
+        }
+    ],
+    "require": {
+        "symfony/framework-bundle": "~2.0",
+        "fzaninotto/faker": "~1.3"
+    },
+    "autoload": {
+        "psr-0": { "Bazinga\\Bundle\\FakerBundle": "" }
+    },
+    "target-dir": "Bazinga/Bundle/FakerBundle",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1.x-dev"
+        }
     }
-  ],
-  "require": {
-    "symfony/framework-bundle": "~2.0",
-    "fzaninotto/faker": "~1.3"
-  },
-  "autoload": {
-    "psr-0": { "Bazinga\\Bundle\\FakerBundle": "" }
-  },
-  "target-dir": "Bazinga/Bundle/FakerBundle"
 }