From e8ea4e910fe7adb5ca9183139772b99789b285ac Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Thu, 28 Mar 2013 11:23:43 +1100
Subject: [PATCH 1/2] Provide branch alias for 1.0

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 97251d3..a76f02a 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,11 @@
         "doctrine/mongodb-odm": "1.0.*@dev",
         "propel/propel1": "1.6.*"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    },
     "autoload": {
         "psr-0": { "FOS\\ElasticaBundle": "" }
     },

From 49a9ad31f22710efbcf1bd712718a59da833237a Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@gmail.com>
Date: Thu, 28 Mar 2013 13:51:45 -0400
Subject: [PATCH 2/2] Revert "Provide branch alias for 1.0"

This reverts commit e8ea4e910fe7adb5ca9183139772b99789b285ac.
---
 composer.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/composer.json b/composer.json
index a76f02a..97251d3 100644
--- a/composer.json
+++ b/composer.json
@@ -26,11 +26,6 @@
         "doctrine/mongodb-odm": "1.0.*@dev",
         "propel/propel1": "1.6.*"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    },
     "autoload": {
         "psr-0": { "FOS\\ElasticaBundle": "" }
     },