Merge pull request #979 from pingunaut/master

James Moger

2015-12-08 f7e28a481bcf86070b829e2574b6d5202124bb0a

 src/main/java/com/gitblit/servlet/ProxyFilter.java

@@ -20,8 +20,8 @@
import java.util.Iterator;
import java.util.List;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;