# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1381888295 18000
# Node ID 52d963f922513f6fc9c2bdca254b789a92e5b0cf
# Parent  f3a275a53bc6f38636f4db13a2965fb505674d91# Parent  f00199f1524ca0f17bd7d7c9dd88cc78c0aa8b3d
Merge with production changes.

diff -r f3a275a53bc6 -r 52d963f92251 bns_website/apache/bns.wsgi
--- a/bns_website/apache/bns.wsgi	Tue Oct 15 20:50:29 2013 -0500
+++ b/bns_website/apache/bns.wsgi	Tue Oct 15 20:51:35 2013 -0500
@@ -1,8 +1,11 @@
 import os
+import site
 import sys
 
 OFFLINE = False
 
+site.addsitedir('/svr/django-sites/bns/lib/python2.7/site-packages')
+
 here = os.path.dirname(__file__)
 website = os.path.dirname(here)
 repo = os.path.dirname(website)
diff -r f3a275a53bc6 -r 52d963f92251 requirements.txt
--- a/requirements.txt	Tue Oct 15 20:50:29 2013 -0500
+++ b/requirements.txt	Tue Oct 15 20:51:35 2013 -0500
@@ -1,13 +1,6 @@
 Django==1.3.7
-distribute==0.6.19
-django-debug-toolbar==0.8.5
+MySQL-python==1.2.4
+argparse==1.2.1
 gdata==2.0.15
+python-memcached==1.48
 wsgiref==0.1.2
-yolk==0.4.1
-Fabric==1.4.3
-MySQL-python==1.2.3
-argparse==1.2.1
-pycrypto==2.6
-ssh==1.7.14
-## The following requirements were added by pip --freeze:
-## The following requirements were added by pip --freeze: