Merge branch 'develop' into ticket-57_develop

Eddy Young

2015-05-22 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66

 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;