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

James Moger

2012-10-13 c658df9e87d65b08d5482cf04489cb0532ff83dd

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

@@ -232,6 +232,7 @@
      form.add(new TextField<String>("emailAddress").setEnabled(editEmailAddress));

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

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

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

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

      form.add(repositories);

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