Merge branch 'ticket/177' into develop

James Moger

2014-09-11 5399d90cefd707e9bf3f9ef7e1f9e6b40d68a955

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

@@ -19,8 +19,8 @@
import java.net.URL;

import java.text.MessageFormat;



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.HttpServlet;

import javax.servlet.http.HttpServletRequest;