# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1400347034 18000
# Node ID 7e17b9e453566a55d91bb5bb2cbec751162e591e
# Parent  aa7c97d93a853315ab3a265d433a2a39c9ac8b8b# Parent  85880b0df024cdb0f87f816d715d5b427891a752
Merge.

diff -r aa7c97d93a85 -r 7e17b9e45356 donations/tests.py
--- a/donations/tests.py	Sat May 17 12:16:21 2014 -0500
+++ b/donations/tests.py	Sat May 17 12:17:14 2014 -0500
@@ -116,9 +116,9 @@
 
     def test_monthly_goal_pct(self):
 
-        self.assertEqual(settings.DONATIONS_GOAL, Decimal('100.00'))
+        self.assertEqual(settings.DONATIONS_GOAL, Decimal('120.00'))
         pct = Donation.objects.monthly_goal_pct(year=2012, month=9)
-        self.assertEqual(pct, 23)
+        self.assertEqual(pct, 19)
 
     def test_monthly_goal_pct2(self):
 
diff -r aa7c97d93a85 -r 7e17b9e45356 requirements_dev.txt
--- a/requirements_dev.txt	Sat May 17 12:16:21 2014 -0500
+++ b/requirements_dev.txt	Sat May 17 12:17:14 2014 -0500
@@ -1,4 +1,4 @@
-Django==1.6.2
+Django==1.6.5
 Markdown==2.3.1
 MySQL-python==1.2.5
 django-debug-toolbar==1.0
@@ -28,7 +28,7 @@
 pycrypto==2.5
 ssh==1.7.13
 ftfy==2.0.1
-Pillow==2.1.0
+Pillow==2.4.0
 boto==2.13.0
 sqlparse==0.1.10
 billiard==3.3.0.13