Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/manager/GitblitManager.java

@@ -649,8 +649,8 @@
    */

   @Override
   public UserModel authenticate(String username, char[] password) {
      return authenticationManager.authenticate(username, password);
   public UserModel authenticate(String username, char[] password, String remoteIP) {
      return authenticationManager.authenticate(username, password, remoteIP);
   }

   @Override