From: Alex Dehnert <adehnert@mit.edu>
Date: Sat, 30 Nov 2013 06:41:06 +0000 (-0500)
Subject: Django plugin: no-op subtree merge
X-Git-Url: https://snippets.scripts.mit.edu/gitweb.cgi/Scripts/git/.git/commitdiff_plain/8bc1ed6486aa6c49c5e50b85cacd58badb08e359

Django plugin: no-op subtree merge

This is a no-op git subtree merge from upstream asa-db, in the hopes of making
pulling newer code with git subtree easier.

Merge commit 'abab96a3e55d8663f996684add635ff7eaf472f6'

* commit 'abab96a3e55d8663f996684add635ff7eaf472f6':
  Scripts auth: Use ldap-too for LDAP server
  Merge "upstream" fixes from SIPB's snippets
  localhost check needs to use portless-HTTP_HOST
  Add scripts_login, to do cert login if possible
  Shamelessly lift MIT-specific code from Remit
---

8bc1ed6486aa6c49c5e50b85cacd58badb08e359