Merge release 1.6.0

James Moger

2014-06-16 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c

 src/test/java/com/gitblit/tests/LdapAuthenticationTest.java

@@ -97,7 +97,7 @@

   private LdapAuthProvider newLdapAuthentication(IStoredSettings settings) {
      RuntimeManager runtime = new RuntimeManager(settings, GitBlitSuite.BASEFOLDER).start();
      userManager = new UserManager(runtime).start();
      userManager = new UserManager(runtime, null).start();
      LdapAuthProvider ldap = new LdapAuthProvider();
      ldap.setup(runtime, userManager);
      return ldap;