# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1379460208 18000
# Node ID 1abc331099b7cffcfaed11a249a3d1c138e37147
# Parent  c09ed90c891b52b851881b3eae0c94df58df662b# Parent  e1153e58162f5fb57ba623f8517c85815317eff3
Merge.

diff -r c09ed90c891b -r 1abc331099b7 requirements.txt
--- a/requirements.txt	Tue Sep 17 18:17:28 2013 -0500
+++ b/requirements.txt	Tue Sep 17 18:23:28 2013 -0500
@@ -1,4 +1,4 @@
-Django==1.5.2
+Django==1.5.4
 Markdown==2.3.1
 MySQL-python==1.2.4
 -e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-dev