Merge branch 'ticket/152' into develop

James Moger

2014-09-04 21fe98ebf8687f68cffbe6b6b8dec0073e93c541

 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;