# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1400348132 18000
# Node ID a9b333d3ed6967898466bd991f8c941eb1440f27
# Parent  71967932fb28cbab76c4f25bf2c99976a36a796e# Parent  6afbb2c77416d3617c6d204d9aabff2b0f459293
Merge.

diff -r 6afbb2c77416 -r a9b333d3ed69 requirements.txt
--- a/requirements.txt	Sat May 17 12:26:35 2014 -0500
+++ b/requirements.txt	Sat May 17 12:35:32 2014 -0500
@@ -1,8 +1,8 @@
-Django==1.6.2
-MySQL-python==1.2.5
+Django==1.6.5
+MySQL-python==1.2.4
 argparse==1.2.1
 python-memcached==1.48
 wsgiref==0.1.2
 django-localflavor==1.0
 docutils==0.11
-Pillow==2.2.2
+Pillow==2.4.0