# HG changeset patch
# User dellsystem <ilostwaldo@gmail.com>
# Date 1350706792 14400
# Node ID 9565b494b989347b959eabfc4b9f4844ea27f3db
# Parent  c494e6ecff586962c5044942a09a572bd1dd6faa# Parent  d31b236ed5cfd81ec71fe51760a62a017a61968d
Merge Jordi's changes

diff -r c494e6ecff58 -r 9565b494b989 apps/bundle/tasks.py
--- a/apps/bundle/tasks.py	Sat Oct 20 00:16:38 2012 -0400
+++ b/apps/bundle/tasks.py	Sat Oct 20 00:19:52 2012 -0400
@@ -1,3 +1,5 @@
+from __future__ import with_statement
+
 import mimetypes
 import os
 
diff -r c494e6ecff58 -r 9565b494b989 apps/bundle/views.py
--- a/apps/bundle/views.py	Sat Oct 20 00:16:38 2012 -0400
+++ b/apps/bundle/views.py	Sat Oct 20 00:19:52 2012 -0400
@@ -1,3 +1,5 @@
+from __future__ import with_statement
+
 import os
 
 from django.shortcuts import get_object_or_404, render, redirect
diff -r c494e6ecff58 -r 9565b494b989 pip-requirements
--- a/pip-requirements	Sat Oct 20 00:16:38 2012 -0400
+++ b/pip-requirements	Sat Oct 20 00:19:52 2012 -0400
@@ -1,7 +1,6 @@
 Django==1.3
 Pygments==1.5
 argparse==1.2.1
-distribute==0.6.24
 django-openid-auth==0.4
 django-registration==0.8
 wsgiref==0.1.2