Merge branch 'ticket/135' into develop

James Moger

2014-09-26 aaa4e8f82711fe228500393b1a3dd5f3f0d78911

 src/main/java/com/gitblit/auth/LdapAuthProvider.java

@@ -427,6 +427,10 @@
            Attribute attribute = userEntry.getAttribute(email);
            if (attribute != null && attribute.hasValue()) {
               user.emailAddress = attribute.getValue();
            } else {
               // issue-456/ticket-134
               // allow LDAP to delete an email address
               user.emailAddress = null;
            }
         }
      }