# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1432690831 18000
# Node ID e56455f4626b449a35aa8ab9352db3119e73e597
# Parent  0a2f23d5bec4586d2aeff2b9ec9209672ac7f339# Parent  8647a669edb443a2a8a12c8dfd5dba86809a7758
Merge with upstream.

diff -r 8647a669edb4 -r e56455f4626b sg101/settings/base.py
--- a/sg101/settings/base.py	Tue May 19 21:08:45 2015 -0500
+++ b/sg101/settings/base.py	Tue May 26 20:40:31 2015 -0500
@@ -75,6 +75,7 @@
     'core.middleware.InactiveUserMiddleware',
     'core.middleware.WhosOnline',
     'wiki.middleware.WikiMiddleware',
+    'waffle.middleware.WaffleMiddleware',
     'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 ]
 
@@ -111,6 +112,7 @@
     'haystack',
     'queued_search',
     'tagging',
+    'waffle',
     'accounts',
     'antispam',
     'bandmap',