Merge branch 'ticket/170' into develop

James Moger

2014-09-08 671b5a456c48028d21855fe05c1fbc9013a180b7

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

@@ -20,8 +20,8 @@
import java.io.IOException;

import java.util.Enumeration;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.FilterChain;

import javax.servlet.FilterConfig;

import javax.servlet.ServletConfig;