Merge branch 'master' of https://github.com/Mrbytes/gitblit

James Moger

2012-10-13 c658df9e87d65b08d5482cf04489cb0532ff83dd

 tests/com/gitblit/tests/LdapUserServiceTest.java

@@ -68,7 +68,7 @@
   }
   
   private MemorySettings getSettings() {
      Map<Object, Object> backingMap = new HashMap<Object, Object>();
      Map<String, Object> backingMap = new HashMap<String, Object>();
      backingMap.put("realm.ldap.server", "ldap://localhost:" + ldapPort);
      backingMap.put("realm.ldap.domain", "");
      backingMap.put("realm.ldap.username", "cn=Directory Manager");