Merge pull request #994 from KeDevServices/master

James Moger

2016-01-16 3d10bc669a9ba263c2e5884ac3e1a7eb4c2f11b6

 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;