# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1336698276 18000
# Node ID 3a1a8ed94e7f3d389bef6e051bf1cfddbba69e2d
# Parent  ef4ef8c8ec8d052e1ec02941d7c7f7fc4343625a# Parent  9dbd9a2a76d6688093eb223139c318b0970395c8
Merge.

diff -r ef4ef8c8ec8d -r 3a1a8ed94e7f requirements.txt
--- a/requirements.txt	Thu May 10 20:03:26 2012 -0500
+++ b/requirements.txt	Thu May 10 20:04:36 2012 -0500
@@ -1,9 +1,9 @@
-Django==1.3.1
+Django==1.4
 -e git://github.com/waylan/Python-Markdown.git@067d88bc41c7924c9087b724ff5247235243ce6b#egg=Markdown-dev
 MySQL-python==1.2.3
 django-debug-toolbar==0.8.5
 -e git+https://github.com/gremmie/django-elsewhere.git@af738d50efb143a86673a2edf258bb93706682c8#egg=django_elsewhere-dev
-django-haystack==1.2.6
+django-haystack==1.2.7
 django-tagging==0.3.1
 gdata==2.0.15
 html5lib==0.90