Merge "Bumping Horizon Django dependency to v1.4 for Folsom."
diff --git a/files/apts/horizon b/files/apts/horizon
index b00d8c0..d93c34b 100644
--- a/files/apts/horizon
+++ b/files/apts/horizon
@@ -18,7 +18,6 @@
python-kombu
python-coverage
python-cherrypy3 # why?
-python-django
python-django-mailer
python-django-nose
python-django-registration
diff --git a/files/pips/horizon b/files/pips/horizon
index c247542..309a5fe 100644
--- a/files/pips/horizon
+++ b/files/pips/horizon
@@ -1,3 +1,4 @@
+django>=1.4
django-mailer # dist:f16
django-nose # dist:f16
django-nose-selenium