Merge branch 'ticket/185' into develop

James Moger

2014-09-24 2fb843db2702f5f6d1df784d53dd6cbba286f4f3

 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;