Merge branch 'ticket/147' into develop

James Moger

2014-09-04 e4c6e723fc0f2c22ace4bad6a37f70d9a1990975

 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;