From 3d774f78672966a153333ce4d978ef85653bfadc Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 21 Jul 2014 10:14:56 +1200
Subject: [PATCH] Fix branch to 3.1 compatibility

---
 .travis.yml   | 4 ++--
 composer.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index af6313a..527ed09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,9 @@ matrix:
     - php: 5.3
       env: DB=PGSQL CORE_RELEASE=3.1
     - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=MYSQL CORE_RELEASE=3.1
     - php: 5.5
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=MYSQL CORE_RELEASE=3.1
 
 before_script:
  - phpenv rehash
diff --git a/composer.json b/composer.json
index 9919717..6077c15 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
 	"require": {
 		"php": ">=5.3.2",
 		"composer/installers": "*",
-		"silverstripe/framework": "~3.1"
+		"silverstripe/framework": ">=3.1,<3.2"
 	},
 	"minimum-stability": "dev"
-	}
+}