Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 src/main/java/com/gitblit/transport/ssh/CachingPublicKeyAuthenticator.java

@@ -83,7 +83,7 @@

      for (SshKey key : keys) {
         log.debug("auth compare to {}", key.getFingerprint());
         if (key.equals(suppliedKey)) {
         if (key.getPublicKey().equals(suppliedKey)) {
            UserModel user = authManager.authenticate(username, key);
            if (user != null) {
               client.setUser(user);