Merge branch 'ticket/136' into develop

James Moger

2014-09-30 1e5905b8da9b76356c99a3d94b2ca9068ffe1c93

 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;