Merge branch 'ticket/135' into develop

James Moger

2014-09-26 ba04d6d62e443cbd23c0544094aa2e55d01b2d0f

 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;