Merge remote-tracking branch 'upstream/master' into translation_to_pt-br

Rafael Cavazin

2012-12-07 6b35f8c32de5ebf7bedc429a6ff62709af9d5acd

 src/com/gitblit/client/UsersPanel.java

@@ -308,7 +308,7 @@
            gitblit.getSettings());

      dialog.setLocationRelativeTo(UsersPanel.this);

      dialog.setUsers(gitblit.getUsers());

      dialog.setRepositories(gitblit.getRepositories(), user.getRepositoryPermissions());

      dialog.setRepositories(gitblit.getRepositories(), gitblit.getUserAccessPermissions(user));

      dialog.setTeams(gitblit.getTeams(), user.teams == null ? null : new ArrayList<TeamModel>(

            user.teams));

      dialog.setVisible(true);