Merge branch 'ticket/183' into develop

James Moger

2014-09-17 5785497bca7d8c18b76d9d18333a1ece0372a8e6

 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;