Merge branch 'ticket/142' into develop

James Moger

2014-09-04 8b1d0aed40b4fc3ed5b30aa824a4c2924b788454

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

@@ -25,8 +25,8 @@
import java.util.Map;

import java.util.Set;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.http.HttpServletResponse;



import com.gitblit.Constants.FederationRequest;