From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 20 Sep 2013 12:32:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d33a954cad55457b52028f7ac57a59a07297c48a;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'

Conflicts:
	docs/source/index.rst
	mediagoblin/templates/mediagoblin/auth/login.html
---

d33a954cad55457b52028f7ac57a59a07297c48a
diff --cc docs/source/index.rst
index e7fda4ad,cad3c033..75a5b66e
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@@ -56,11 -56,10 +56,12 @@@ Part 2: Core plugin documentatio
  
     plugindocs/flatpagesfile
     plugindocs/sampleplugin
 -   plugindocs/oauth
     plugindocs/trim_whitespace
     plugindocs/raven
 +   plugindocs/basic_auth
 +   plugindocs/openid
 +   plugindocs/persona
+    plugindocs/ldap
  
  
  Part 3: Plugin Writer's Guide