From 43033152b7355202f02a03da93c5bc0e69516e83 Mon Sep 17 00:00:00 2001
From: William DURAND <william.durand1@gmail.com>
Date: Wed, 23 May 2012 09:44:19 +0200
Subject: [PATCH] Aliased master to 2.*

---
 README.md     | 3 +++
 composer.json | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f84c5d7..365fb87 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@ NelmioApiDocBundle
 
 The **NelmioApiDocBundle** bundle allows you to generate a decent documentation for your APIs.
 
+**Important:** This bundle is developed in sync with [symfony's repository](https://github.com/symfony/symfony).
+For Symfony 2.0.x, you need to use the 1.* version of the bundle.
+
 
 ## Installation ##
 
diff --git a/composer.json b/composer.json
index 5eec681..aa3b967 100644
--- a/composer.json
+++ b/composer.json
@@ -28,5 +28,10 @@
     "autoload": {
         "psr-0": { "Nelmio\\ApiDocBundle": "" }
     },
-    "target-dir": "Nelmio/ApiDocBundle"
+    "target-dir": "Nelmio/ApiDocBundle",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    }
 }