From d25f208384e0de82f9b39d7c804659c18cb5d11d Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Wed, 11 Sep 2013 19:57:04 +0200
Subject: [PATCH] Update requirements

---
 .travis.yml      | 12 ++++++------
 requirements.txt |  2 +-
 setup.py         |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2c1a82b28..3a433a32a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,13 @@ python:
 
 # Manually define here the combinations of django and db versions to test
 env:
-#  - DJANGO_VERSION=1.4.6 DB=mysql
-  - DJANGO_VERSION=1.4.6 DB=postgresql 
-  - DJANGO_VERSION=1.4.6 DB=sqlite
+#  - DJANGO_VERSION=1.4.7 DB=mysql
+  - DJANGO_VERSION=1.4.7 DB=postgresql 
+  - DJANGO_VERSION=1.4.7 DB=sqlite
 
-#  - DJANGO_VERSION=1.5.2 DB=mysql
-  - DJANGO_VERSION=1.5.2 DB=postgresql
-  - DJANGO_VERSION=1.5.2 DB=sqlite
+#  - DJANGO_VERSION=1.5.3 DB=mysql
+  - DJANGO_VERSION=1.5.3 DB=postgresql
+  - DJANGO_VERSION=1.5.3 DB=sqlite
 
 # Install the application
 install:
diff --git a/requirements.txt b/requirements.txt
index 957832364..3f3fdeb7a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.5.2
+Django==1.5.3
 django-browserid==0.9
 django-recaptcha
 reportlab
diff --git a/setup.py b/setup.py
index bd967a3a8..0bb8fdcb5 100644
--- a/setup.py
+++ b/setup.py
@@ -43,17 +43,17 @@ setup(
         'versiontools >= 1.6',
     ],
     install_requires=[
-        'django >= 1.5.1',
+        'django >= 1.5.3',
         'reportlab',
-        'django-browserid == 0.8',
+        'django-browserid == 0.9',
         'django-recaptcha',
         'django_mobile',
         'django-discover-runner',
         'pep8',
         'bleach',
         'south < 2.0',
-        'html5lib == 0.95',
-        'django-tastypie'
+        'django-tastypie',
+        'python-mimeparse'
     ],
     entry_points={
         'console_scripts': [