Merge branch 'delete-branch' of https://github.com/ajermakovics/gitblit

James Moger

2012-09-20 37864ade1f2ab700e496394b8032dbba9b97f2c0

 src/com/gitblit/GitblitUserService.java

@@ -138,7 +138,7 @@
   }



   @Override

   public char[] getCookie(UserModel model) {

   public String getCookie(UserModel model) {

      return serviceImpl.getCookie(model);

   }