Merge branch 'topic/pr-935' into develop

James Moger

2015-10-05 1c261bd5fbe8f4750f17678f85f98cf101439b71

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

@@ -120,7 +120,7 @@
               File realmFile = runtimeManager.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf");
               service = createUserService(realmFile);
            } catch (InstantiationException | IllegalAccessException  e) {
               logger.error("failed to instanciate user service {}: {}", realm, e.getMessage());
               logger.error("failed to instantiate user service {}: {}", realm, e.getMessage());
            }
         }
         setUserService(service);