Merge jcrygier's LDAP injection defense and displayname/email retrieval

James Moger

2012-04-25 d2426e1eb5d07664b5c26c4247fae3325282d60d

 tests/com/gitblit/tests/GitBlitTest.java

@@ -17,8 +17,8 @@


import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;



import java.util.List;