From d2426e1eb5d07664b5c26c4247fae3325282d60d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 25 Apr 2012 16:35:40 -0400
Subject: [PATCH] Merge jcrygier's LDAP injection defense and displayname/email retrieval

---
 docs/01_features.mkd |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index 8adf4cf..667a09c 100644
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -19,6 +19,7 @@
 - Administrators may create, edit, rename, or delete teams through the web UI or RPC interface
 - Repository Owners may edit repositories through the web UI
 - Administrators and Repository Owners may set the default branch through the web UI or RPC interface
+- LDAP authentication and optional LDAP-controlled Team memberships
 - Gravatar integration
 - Git-notes display support
 - gh-pages display support (Jekyll is not supported)
@@ -56,4 +57,4 @@
 ### Caveats
 - Gitblit may have security holes.  Patches welcome.  :)
 
-[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
\ No newline at end of file
+[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"

--
Gitblit v1.9.1