From 322a7b57ed1058b7fec68742112a5124f620afaa Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Thu, 8 Aug 2013 16:41:39 -0300
Subject: [PATCH] Moving socks settings to bottom

---
 src/colab/custom_settings.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 1d56ec7..c32aeeb 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -129,20 +129,19 @@ MIDDLEWARE_CLASSES = (
 
 # Add the django_browserid authentication backend.
 AUTHENTICATION_BACKENDS = (
-   'django_browserid.auth.BrowserIDBackend',
+    'django.contrib.auth.backends.ModelBackend',
+    'accounts.auth.ColabBrowserIDBackend',
 )
 
-
-
-SOCKS_SERVER = None
-SOCKS_PORT = None
-
 STATICFILES_DIRS = (
     os.path.join(BASE_DIR, 'colab', 'static'),
 )
 
 STATIC_ROOT = os.path.join(BASE_DIR, '..', 'www', 'static')
 
+SOCKS_SERVER = None
+SOCKS_PORT = None
+
 from feedzilla.settings import *
 FEEDZILLA_PAGE_SIZE = 5
 FEEDZILLA_SITE_TITLE = gettext(u'Planet Colab')
--
libgit2 0.21.2