From 9a43f5aa3cfcc42ca47aea609ac09b0e1f523f33 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Mon, 11 Aug 2014 17:05:23 +0200
Subject: [PATCH] update composer file, introducing 2.1 version

---
 composer.json | 2 +-
 composer.lock | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8788db05d..adf361433 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.0-dev"
+            "dev-master": "2.1.0-dev"
         }
     },
     "repositories": [
diff --git a/composer.lock b/composer.lock
index 2f1e713a0..7d58da10b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "4606e1d72b13b6b8fa84dca5f7bac16b",
+    "hash": "491658296d844863c480ef8411f8efa3",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -2734,6 +2734,7 @@
         "fzaninotto/faker": 20,
         "maximebf/debugbar": 20
     },
+    "prefer-stable": false,
     "platform": {
         "php": ">=5.4"
     },