Merge release 1.6.0

James Moger

2014-06-16 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c

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

@@ -16,7 +16,6 @@
package com.gitblit.wicket.pages;



import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.panels.TeamsPanel;

import com.gitblit.wicket.panels.UsersPanel;



@RequiresAdminRole

@@ -25,8 +24,6 @@
   public UsersPage() {

      super();

      setupPage("", "");



      add(new TeamsPanel("teamsPanel", showAdmin).setVisible(showAdmin));



      add(new UsersPanel("usersPanel", showAdmin).setVisible(showAdmin));

   }