Merge branch 'topic/pr-935' into develop

James Moger

2015-10-05 1c261bd5fbe8f4750f17678f85f98cf101439b71

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

@@ -23,8 +23,8 @@
import java.util.List;

import java.util.Map;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;