From 92d618348194f37e18fdfd1acc3b024b93849177 Mon Sep 17 00:00:00 2001
From: Tinnet Coronam <tinnet@coronam.net>
Date: Fri, 11 Jan 2013 16:16:48 +0100
Subject: [PATCH 1/2] added django 1.5RC testing to tox

---
 tox.ini | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tox.ini b/tox.ini
index d4581a0..66bf54f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 envlist =
         py2.6-django1.2,py2.6-django1.3,py2.6-django1.4,
         py2.7-django1.2,py2.7-django1.3,py2.7-django1.4,
+        py2.6-django1.5,py2.7-django1.5
 
 [testenv]
 commands = python -Wall setup.py test
@@ -29,3 +30,11 @@ deps = Django>=1.3,<1.4
 [testenv:py2.7-django1.4]
 basepython = python2.7
 deps = Django>=1.4,<1.5
+
+[testenv:py2.6-django1.5]
+basepython = python2.6
+deps = https://github.com/django/django/zipball/stable/1.5.x
+
+[testenv:py2.7-django1.5]
+basepython = python2.7
+deps = https://github.com/django/django/zipball/stable/1.5.x
\ No newline at end of file

From f11a35e4eddcb40c7d74472432daeae15e1477e8 Mon Sep 17 00:00:00 2001
From: Tinnet Coronam <tinnet@coronam.net>
Date: Fri, 8 Mar 2013 16:32:52 +0100
Subject: [PATCH 2/2] use final django 1.5

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 66bf54f..dc14e37 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,8 +33,8 @@ deps = Django>=1.4,<1.5
 
 [testenv:py2.6-django1.5]
 basepython = python2.6
-deps = https://github.com/django/django/zipball/stable/1.5.x
+deps = Django>=1.5,<1.6
 
 [testenv:py2.7-django1.5]
 basepython = python2.7
-deps = https://github.com/django/django/zipball/stable/1.5.x
\ No newline at end of file
+deps = Django>=1.5,<1.6
\ No newline at end of file