Merge branch 'ticket/152' into develop

James Moger

2014-09-04 21fe98ebf8687f68cffbe6b6b8dec0073e93c541

 src/main/java/com/gitblit/wicket/GitblitWicketFilter.java

@@ -17,8 +17,8 @@


import java.util.Date;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServletRequest;



import org.apache.wicket.protocol.http.IWebApplicationFactory;