Merge branch 'develop' into ticket-57_develop

Eddy Young

2015-05-22 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66

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

@@ -178,7 +178,9 @@


            // update user permissions

            for (RegistrantAccessPermission repositoryPermission : permissions) {

               userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

               if (repositoryPermission.mutable) {

                  userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

               }

            }



            Iterator<String> selectedTeams = teams.getSelectedChoices();