Merge branch 'master' of https://github.com/gitblit/gitblit

mrbytes

2014-03-08 6be15a1cac2f98585174f501879c3685ef2a54b6

 src/main/java/com/gitblit/wicket/pages/EditUserPage.java

@@ -243,6 +243,8 @@
      form.add(new CheckBox("canFork").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));

      form.add(new CheckBox("canCreate"));

      form.add(new CheckBox("excludeFromFederation"));

      form.add(new CheckBox("disabled"));



      form.add(new RegistrantPermissionsPanel("repositories",   RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions()));

      form.add(teams.setEnabled(editTeams));