Merge branch 'ticket/115' into develop

James Moger

2014-06-27 5b41f21c57274c4f2e58b78dcb8666d0b37dc6d2

 src/main/java/com/gitblit/auth/PAMAuthProvider.java

@@ -98,7 +98,9 @@
         logger.error(e.getMessage());
         return null;
      } finally {
         pam.dispose();
         if (pam != null) {
            pam.dispose();
         }
      }

        UserModel user = userManager.getUserModel(username);